From 36e0afc8a2b81b98812e1e09cbef455676dca8e24b77b2e7dd9aa5094cea6f15 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 18 Aug 2023 13:20:40 +0000 Subject: [PATCH] - Don't build systemd-doc with the mini flavor OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1428 --- systemd.changes | 5 +++++ systemd.spec | 32 ++++++++++++++------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/systemd.changes b/systemd.changes index 05c92a54..20343c25 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 18 13:19:39 UTC 2023 - Franck Bui + +- Don't build systemd-doc with the mini flavor + ------------------------------------------------------------------- Fri Aug 18 06:24:11 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 396d876f..1a5109bc 100644 --- a/systemd.spec +++ b/systemd.spec @@ -226,19 +226,6 @@ maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. -%package doc -Summary: HTML documentation for systemd -License: LGPL-2.1-or-later -%if %{with bootstrap} -Conflicts: systemd-doc -Requires: this-is-only-for-build-envs -%else -Supplements: (systemd and patterns-base-documentation) -%endif - -%description doc -The HTML documentation for systemd. - %package devel Summary: Development files for libsystemd and libudev License: LGPL-2.1-or-later @@ -693,6 +680,14 @@ Have fun (at your own risk). %if %{without bootstrap} %lang_package + +%package doc +Summary: HTML documentation for systemd +License: LGPL-2.1-or-later +Supplements: (systemd and patterns-base-documentation) + +%description doc +The HTML documentation for systemd. %endif %prep @@ -1009,7 +1004,8 @@ tar -cO \ %if %{without bootstrap} %find_lang systemd %else -rm -f %{buildroot}%{_journalcatalogdir}/* +rm -f %{buildroot}%{_journalcatalogdir}/* +rm -fr %{buildroot}%{_docdir}/systemd %endif # Don't drop %%pre section even if it becomes empty: the build process of @@ -1320,10 +1316,6 @@ fi %include %{SOURCE203} %endif -%files doc -%defattr(-,root,root,-) -%{_docdir}/systemd/ - %files devel %defattr(-,root,root,-) %license LICENSE.LGPL2.1 @@ -1356,6 +1348,10 @@ fi %if %{without bootstrap} %files lang -f systemd.lang %include %{SOURCE210} + +%files doc +%defattr(-,root,root,-) +%{_docdir}/systemd/ %endif %if %{with journal_remote}