From b398d77dd088608988ddb176a0ba7ab00d330c362cea37e551bad948074082f7 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 21 Feb 2020 17:09:02 +0000 Subject: [PATCH] Accepting request 777986 from home:lnussel:branches:Base:System - move html documentation to sparate package to save space - move networkd and resolved binaries into correct subpackage - move html documentation to sparate package to save space - move networkd and resolved binaries into correct subpackage OBS-URL: https://build.opensuse.org/request/show/777986 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1087 --- systemd-mini.changes | 6 ++++++ systemd-mini.spec | 39 +++++++++++++++++++++++++++++++++++++++ systemd.changes | 6 ++++++ systemd.spec | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index 490955b2..d82f8db4 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 19 17:24:35 UTC 2020 - Ludwig Nussel + +- move html documentation to sparate package to save space +- move networkd and resolved binaries into correct subpackage + ------------------------------------------------------------------- Thu Feb 6 14:15:01 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 3bda3fe4..4c7e941a 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -178,6 +178,19 @@ 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. +%if !0%{?bootstrap} +%package doc +Summary: HTML documentation for systemd +License: LGPL-2.1-or-later +Group: Documentation/Other +Supplements: (systemd and patterns-base-documentation) + +%description doc +The HTML documenation for systemd + +# /bootstrap +%endif + %package devel Summary: Development headers for systemd License: LGPL-2.1-or-later @@ -1076,6 +1089,13 @@ fi %exclude %{_unitdir}/systemd-importd.service %exclude %{_unitdir}/dbus-org.freedesktop.import1.service %endif +%if %{with networkd} +%exclude %{_unitdir}/systemd-networkd.service +%exclude %{_unitdir}/systemd-networkd.socket +%exclude %{_unitdir}/systemd-networkd-wait-online.service +%exclude %{_prefix}/lib/systemd/systemd-resolved +%exclude %{_unitdir}/systemd-resolved.service +%endif %if %{with portabled} %exclude %{_prefix}/lib/systemd/systemd-portabled %exclude %{_prefix}/lib/systemd/portable @@ -1249,7 +1269,9 @@ fi %exclude %{_mandir}/man*/systemd-portabled* %endif %endif + %{_docdir}/systemd +%exclude %{_docdir}/systemd/html %{_udevrulesdir}/70-uaccess.rules %{_udevrulesdir}/71-seat.rules @@ -1274,6 +1296,15 @@ fi %{_datadir}/zsh/site-functions/* %{_datadir}/pkgconfig/systemd.pc +%if ! 0%{?bootstrap} +%files doc +%defattr(-,root,root,-) +%dir %{_docdir}/systemd +%{_docdir}/systemd/html + +# /bootstrap +%endif + %files devel %defattr(-,root,root,-) %{_libdir}/libsystemd.so @@ -1500,6 +1531,14 @@ fi %{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules %{_prefix}/lib/systemd/network/*.network %{_prefix}/lib/systemd/network/*.network.example +%{_prefix}/lib/systemd/systemd-network-generator +%{_prefix}/lib/systemd/systemd-networkd +%{_prefix}/lib/systemd/systemd-networkd-wait-online +%{_unitdir}/systemd-networkd.service +%{_unitdir}/systemd-networkd.socket +%{_unitdir}/systemd-networkd-wait-online.service +%{_prefix}/lib/systemd/systemd-resolved +%{_unitdir}/systemd-resolved.service %endif %if %{with resolved} %{_bindir}/resolvectl diff --git a/systemd.changes b/systemd.changes index 490955b2..d82f8db4 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 19 17:24:35 UTC 2020 - Ludwig Nussel + +- move html documentation to sparate package to save space +- move networkd and resolved binaries into correct subpackage + ------------------------------------------------------------------- Thu Feb 6 14:15:01 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index e464f4ff..9f7cf41e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -176,6 +176,19 @@ 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. +%if !0%{?bootstrap} +%package doc +Summary: HTML documentation for systemd +License: LGPL-2.1-or-later +Group: Documentation/Other +Supplements: (systemd and patterns-base-documentation) + +%description doc +The HTML documenation for systemd + +# /bootstrap +%endif + %package devel Summary: Development headers for systemd License: LGPL-2.1-or-later @@ -1074,6 +1087,13 @@ fi %exclude %{_unitdir}/systemd-importd.service %exclude %{_unitdir}/dbus-org.freedesktop.import1.service %endif +%if %{with networkd} +%exclude %{_unitdir}/systemd-networkd.service +%exclude %{_unitdir}/systemd-networkd.socket +%exclude %{_unitdir}/systemd-networkd-wait-online.service +%exclude %{_prefix}/lib/systemd/systemd-resolved +%exclude %{_unitdir}/systemd-resolved.service +%endif %if %{with portabled} %exclude %{_prefix}/lib/systemd/systemd-portabled %exclude %{_prefix}/lib/systemd/portable @@ -1247,7 +1267,9 @@ fi %exclude %{_mandir}/man*/systemd-portabled* %endif %endif + %{_docdir}/systemd +%exclude %{_docdir}/systemd/html %{_udevrulesdir}/70-uaccess.rules %{_udevrulesdir}/71-seat.rules @@ -1272,6 +1294,15 @@ fi %{_datadir}/zsh/site-functions/* %{_datadir}/pkgconfig/systemd.pc +%if ! 0%{?bootstrap} +%files doc +%defattr(-,root,root,-) +%dir %{_docdir}/systemd +%{_docdir}/systemd/html + +# /bootstrap +%endif + %files devel %defattr(-,root,root,-) %{_libdir}/libsystemd.so @@ -1498,6 +1529,14 @@ fi %{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules %{_prefix}/lib/systemd/network/*.network %{_prefix}/lib/systemd/network/*.network.example +%{_prefix}/lib/systemd/systemd-network-generator +%{_prefix}/lib/systemd/systemd-networkd +%{_prefix}/lib/systemd/systemd-networkd-wait-online +%{_unitdir}/systemd-networkd.service +%{_unitdir}/systemd-networkd.socket +%{_unitdir}/systemd-networkd-wait-online.service +%{_prefix}/lib/systemd/systemd-resolved +%{_unitdir}/systemd-resolved.service %endif %if %{with resolved} %{_bindir}/resolvectl