From 19dfb206d5f00b852a9ec155f90d85636b69a6471b37e0e6699a0cc665a5ccaf Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 26 Feb 2018 10:53:13 +0000 Subject: [PATCH] Accepting request 580181 from home:fbui:systemd:Factory - Fix build errors due to the split-off of systemd-containe: found conflict of systemd-234-33.1.x86_64 with systemd-container-234-33.1.x86_64: - /usr/share/man/man5/systemd.nspawn.5.gz - /usr/share/man/man1/systemd-nspawn.1.gz found conflict of systemd-container-234-33.1.x86_64 with systemd-mini-container-234-33.1.x86_64: - /usr/bin/systemd-nspawn - /usr/lib/systemd/system/systemd-nspawn@.service - /usr/lib/tmpfiles.d/systemd-nspawn.conf OBS-URL: https://build.opensuse.org/request/show/580181 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1016 --- systemd-mini.changes | 17 +++++++++++++++-- systemd-mini.spec | 10 ++++++---- systemd.changes | 15 ++++++++++++++- systemd.spec | 10 ++++++---- 4 files changed, 41 insertions(+), 11 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 90ba8929..b10856aa 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,12 +1,25 @@ ------------------------------------------------------------------- -Thu Feb 22 15:15:09 UTC 2018 - fvogt@suse.com +Mon Feb 26 10:47:39 UTC 2018 - fbui@suse.com + +- Fix build errors due to the split-off of systemd-containe: + + found conflict of systemd-234-33.1.x86_64 with systemd-container-234-33.1.x86_64: + - /usr/share/man/man5/systemd.nspawn.5.gz + - /usr/share/man/man1/systemd-nspawn.1.gz + found conflict of systemd-container-234-33.1.x86_64 with systemd-mini-container-234-33.1.x86_64: + - /usr/bin/systemd-nspawn + - /usr/lib/systemd/system/systemd-nspawn@.service + - /usr/lib/tmpfiles.d/systemd-nspawn.conf + +------------------------------------------------------------------- +Thu Feb 22 15:11:13 UTC 2018 - fvogt@suse.com - Use %license (boo#1082318) ------------------------------------------------------------------- Thu Feb 22 14:57:19 UTC 2018 - fbui@suse.com -- Split off systemd-container sub-package off +- Split systemd-container sub-package off Other distros already do it and it seems a good idea to not install this stuff on new installations by default. At least diff --git a/systemd-mini.spec b/systemd-mini.spec index 4530958c..c627c00b 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -475,6 +475,9 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} %else rm %{buildroot}%{_libdir}/libnss_systemd.so* +rm %{buildroot}%{_bindir}/systemd-nspawn +rm %{buildroot}%{_unitdir}/systemd-nspawn@.service +rm %{buildroot}%{_tmpfilesdir}/systemd-nspawn.conf %endif # FIXME: these symlinks should die. @@ -775,6 +778,7 @@ systemctl daemon-reload || : %postun -n libudev%{?mini}1 -p /sbin/ldconfig %postun -n libsystemd0%{?mini} -p /sbin/ldconfig +%if ! 0%{?bootstrap} %post container if [ $1 -gt 1 ]; then # Convert /var/lib/machines subvolume to make it suitable for @@ -795,7 +799,6 @@ if [ $1 -gt 1 ]; then %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : fi -%if ! 0%{?bootstrap} %post logger %tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/ if [ "$1" -eq 1 ]; then @@ -1094,6 +1097,7 @@ fi %{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-u[ps]* %{_mandir}/man8/30-systemd-environment-d-generator.* +%exclude %{_mandir}/man*/*nspawn* %if %{with machined} %exclude %{_mandir}/man*/machinectl* %exclude %{_mandir}/man*/systemd-machined* @@ -1222,6 +1226,7 @@ fi %{_mandir}/man3/*udev*.3* %endif +%if ! 0%{?bootstrap} %files container %defattr(-,root,root) %{_bindir}/systemd-nspawn @@ -1251,7 +1256,6 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.import1.service %{_datadir}/polkit-1/actions/org.freedesktop.import1.policy %endif -%if ! 0%{?bootstrap} %{_mandir}/man*/*nspawn* %if %{with machined} %{_mandir}/man*/machinectl* @@ -1260,9 +1264,7 @@ fi %if %{with importd} %{_mandir}/man*/systemd-importd* %endif -%endif -%if ! 0%{?bootstrap} %files logger %defattr(-,root,root) %dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/ diff --git a/systemd.changes b/systemd.changes index 26973404..b10856aa 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Feb 26 10:47:39 UTC 2018 - fbui@suse.com + +- Fix build errors due to the split-off of systemd-containe: + + found conflict of systemd-234-33.1.x86_64 with systemd-container-234-33.1.x86_64: + - /usr/share/man/man5/systemd.nspawn.5.gz + - /usr/share/man/man1/systemd-nspawn.1.gz + found conflict of systemd-container-234-33.1.x86_64 with systemd-mini-container-234-33.1.x86_64: + - /usr/bin/systemd-nspawn + - /usr/lib/systemd/system/systemd-nspawn@.service + - /usr/lib/tmpfiles.d/systemd-nspawn.conf + ------------------------------------------------------------------- Thu Feb 22 15:11:13 UTC 2018 - fvogt@suse.com @@ -6,7 +19,7 @@ Thu Feb 22 15:11:13 UTC 2018 - fvogt@suse.com ------------------------------------------------------------------- Thu Feb 22 14:57:19 UTC 2018 - fbui@suse.com -- Split off systemd-container sub-package off +- Split systemd-container sub-package off Other distros already do it and it seems a good idea to not install this stuff on new installations by default. At least diff --git a/systemd.spec b/systemd.spec index be2ed4ee..95da200d 100644 --- a/systemd.spec +++ b/systemd.spec @@ -473,6 +473,9 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} %else rm %{buildroot}%{_libdir}/libnss_systemd.so* +rm %{buildroot}%{_bindir}/systemd-nspawn +rm %{buildroot}%{_unitdir}/systemd-nspawn@.service +rm %{buildroot}%{_tmpfilesdir}/systemd-nspawn.conf %endif # FIXME: these symlinks should die. @@ -773,6 +776,7 @@ systemctl daemon-reload || : %postun -n libudev%{?mini}1 -p /sbin/ldconfig %postun -n libsystemd0%{?mini} -p /sbin/ldconfig +%if ! 0%{?bootstrap} %post container if [ $1 -gt 1 ]; then # Convert /var/lib/machines subvolume to make it suitable for @@ -793,7 +797,6 @@ if [ $1 -gt 1 ]; then %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : fi -%if ! 0%{?bootstrap} %post logger %tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/ if [ "$1" -eq 1 ]; then @@ -1092,6 +1095,7 @@ fi %{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-u[ps]* %{_mandir}/man8/30-systemd-environment-d-generator.* +%exclude %{_mandir}/man*/*nspawn* %if %{with machined} %exclude %{_mandir}/man*/machinectl* %exclude %{_mandir}/man*/systemd-machined* @@ -1220,6 +1224,7 @@ fi %{_mandir}/man3/*udev*.3* %endif +%if ! 0%{?bootstrap} %files container %defattr(-,root,root) %{_bindir}/systemd-nspawn @@ -1249,7 +1254,6 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.import1.service %{_datadir}/polkit-1/actions/org.freedesktop.import1.policy %endif -%if ! 0%{?bootstrap} %{_mandir}/man*/*nspawn* %if %{with machined} %{_mandir}/man*/machinectl* @@ -1258,9 +1262,7 @@ fi %if %{with importd} %{_mandir}/man*/systemd-importd* %endif -%endif -%if ! 0%{?bootstrap} %files logger %defattr(-,root,root) %dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/