diff --git a/erlang.spec b/erlang.spec index c40394a..a4d41aa 100644 --- a/erlang.spec +++ b/erlang.spec @@ -64,7 +64,7 @@ Name: erlang Version: 24.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: General-purpose programming language and runtime environment License: ASL 2.0 @@ -814,7 +814,12 @@ cd $RPM_BUILD_ROOT%{_libdir}/erlang mv -v doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} for i in erts-* ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/$i ; done cd $RPM_BUILD_ROOT%{_libdir}/erlang/lib -for i in * ; do mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/lib/$i || true ; done +for i in * ; do + mv -v $i/doc $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/lib/$i || true + # symlink 'chunks' in the code path for EEP-48 compliance (rhbz#2068758) + mkdir $i/doc + ln -s %{_docdir}/%{name}-%{version}/lib/$i/chunks $i/doc/ +done popd cp -av AUTHORS LICENSE.txt README.md $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} mv -v $RPM_BUILD_ROOT%{_libdir}/erlang/PR.template $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} @@ -1026,6 +1031,7 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %if %{with doc} %files doc +%{_libdir}/erlang/lib/*/doc %doc %{_docdir}/%{name}-%{version}/doc %doc %{_docdir}/%{name}-%{version}/erts-*/ %doc %{_docdir}/%{name}-%{version}/lib/ @@ -1903,6 +1909,9 @@ useradd -r -g epmd -d /dev/null -s /sbin/nologin \ %changelog +* Mon Mar 28 2022 John Eckersberg - 24.2.2-2 +- Keep documentation chunks in the code path (rhbz#2068758) + * Tue Mar 1 2022 Peter Lemenkov - 24.2.2-1 - Ver. 24.2.2