From e5ed31cfb5b484ab8e4dee353fc3938da2a6200cc71139170b4285366e8225b9 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 16 Jan 2018 09:29:10 +0000 Subject: [PATCH] Accepting request 563829 from home:sbrabec:branches:util-linux-1074250 Exactly like rq#561705, but path to rfkill is fixed in rfkill-*.service. - Integrate rfkill-block@.service and rfkill-unblock@.service from rfkill package (boo#1074250#c4). - Remove unneeded release based conflicts and obsolescences (boo#1074250#c18). - Remove sysvinit requirement. OBS-URL: https://build.opensuse.org/request/show/563829 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=357 --- python-libmount.changes | 9 +++++++++ python-libmount.spec | 41 +++++++++++++++----------------------- rfkill-block@.service | 10 ++++++++++ rfkill-unblock@.service | 10 ++++++++++ util-linux-systemd.changes | 9 +++++++++ util-linux-systemd.spec | 41 +++++++++++++++----------------------- util-linux.changes | 9 +++++++++ util-linux.spec | 41 +++++++++++++++----------------------- 8 files changed, 95 insertions(+), 75 deletions(-) create mode 100644 rfkill-block@.service create mode 100644 rfkill-unblock@.service diff --git a/python-libmount.changes b/python-libmount.changes index fefdce9..41cc10d 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 12 13:49:36 CET 2018 - sbrabec@suse.com + +- Integrate rfkill-block@.service and rfkill-unblock@.service from + rfkill package (boo#1074250#c4). +- Remove unneeded release based conflicts and obsolescences + (boo#1074250#c18). +- Remove sysvinit requirement. + ------------------------------------------------------------------- Mon Jan 1 10:32:51 UTC 2018 - antoine.belvire@opensuse.org diff --git a/python-libmount.spec b/python-libmount.spec index a814470..0054cb7 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -149,6 +149,9 @@ Source28: mkzimage_cmdline.8 Source29: mkzimage_cmdline.c Source31: addnote.c # +Source41: rfkill-block@.service +Source42: rfkill-unblock@.service +# Source51: blkid.conf ## ## util-linux patches @@ -173,26 +176,15 @@ Provides: fsck-with-dev-lock = %{version} Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions Recommends: %{name}-lang = %{version} -Provides: eject = 2.1.0-166.8 -Provides: login = 4.0-33.7 +Provides: eject = 2.1.0 +Provides: login = 4.0 Provides: rfkill = 0.5 # File conflict of eject (up to 12.3 and SLE11). -Obsoletes: eject < 2.1.0-166.8 +Obsoletes: eject <= 2.1.0 # File conflict of login (up to 12.1 and SLE11). -Obsoletes: login < 4.0-33.7 +Obsoletes: login <= 4.0 # File confluct (man page) of rfkill (up to Leap 15 and SLE 15). Obsoletes: rfkill <= 0.5 -# File conflict of su and kill (up to 12.3 and SLE11). -# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. -Conflicts: coreutils < 8.21 -%if 0%{?suse_version} < 1330 -# File conflict of sulogin and utmpdump (up to 12.3 and SLE11). -Conflicts: sysvinit-tools < 2.88+-87 -%endif -# rfkill conflicts of completion files with <= Leap 42.3 and < SLE15. -Conflicts: bash-completion <= 2.7-1.3 -# The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775) -Conflicts: systemd-presets-branding < 12.2 # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -200,16 +192,7 @@ Provides: s390-32 %endif # uuid-runtime appeared in SLE11 SP1 to SLE11 SP3 Provides: uuid-runtime = %{version}-%{release} -Obsoletes: uuid-runtime < %{version}-%{release} -%if 0%{?suse_version} < 1330 -#BEGIN sysv compatibility hack -# After migration of raw init script to systemd, util-linux no more depends on -# fillup and insserv. Many poorly written packages implicitly depend on them -# without declaring it. Keep these dependencies in Leap 42 + SLE 12 line to -# prevent failures. -PreReq: %insserv_prereq %fillup_prereq -#END sysv compatibility hack -%endif +Obsoletes: uuid-runtime <= 2.19.1 # # Using "Requires" here would lend itself to help upgrading, but since # util-linux is in the initial bootstrap, that is not a good thing to do: @@ -655,6 +638,8 @@ pushd ../klogconsole # klogconsole install make install DEST=%{buildroot} popd +install -Dm644 %{SOURCE41} %{buildroot}%{_unitdir}/rfkill-block@.service +install -Dm644 %{SOURCE42} %{buildroot}%{_unitdir}/rfkill-unblock@.service %endif # # util-linux install @@ -789,9 +774,11 @@ ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim %if %build_util_linux %pre %{service_add_pre raw.service} +%service_add_pre rfkill-block@.service rfkill-unblock@.service %post %{service_add_post raw.service} +%service_add_post rfkill-block@.service rfkill-unblock@.service %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux @@ -814,9 +801,11 @@ done %preun %{service_del_preun raw.service} +%service_del_preun rfkill-block@.service rfkill-unblock@.service %postun %{service_del_postun raw.service} +%service_del_postun rfkill-block@.service rfkill-unblock@.service %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount @@ -902,6 +891,8 @@ getent passwd uuidd >/dev/null || \ %doc Documentation/mount.txt %doc Documentation/pg.txt %{_unitdir}/raw.service +%{_unitdir}/rfkill-block@.service +%{_unitdir}/rfkill-unblock@.service %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/blkid.conf diff --git a/rfkill-block@.service b/rfkill-block@.service new file mode 100644 index 0000000..4292a69 --- /dev/null +++ b/rfkill-block@.service @@ -0,0 +1,10 @@ +[Unit] +Description=RFKill-Block %I +After=rfkill-unblock@all.service + +[Service] +Type=oneshot +ExecStart=/usr/bin/rfkill block %I + +[Install] +WantedBy=multi-user.target diff --git a/rfkill-unblock@.service b/rfkill-unblock@.service new file mode 100644 index 0000000..b2f447e --- /dev/null +++ b/rfkill-unblock@.service @@ -0,0 +1,10 @@ +[Unit] +Description=RFKill-Unblock %I +After=rfkill-block@all.service + +[Service] +Type=oneshot +ExecStart=/usr/bin/rfkill unblock %I + +[Install] +WantedBy=multi-user.target diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index fefdce9..41cc10d 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 12 13:49:36 CET 2018 - sbrabec@suse.com + +- Integrate rfkill-block@.service and rfkill-unblock@.service from + rfkill package (boo#1074250#c4). +- Remove unneeded release based conflicts and obsolescences + (boo#1074250#c18). +- Remove sysvinit requirement. + ------------------------------------------------------------------- Mon Jan 1 10:32:51 UTC 2018 - antoine.belvire@opensuse.org diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index fe52efa..b85327d 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -149,6 +149,9 @@ Source28: mkzimage_cmdline.8 Source29: mkzimage_cmdline.c Source31: addnote.c # +Source41: rfkill-block@.service +Source42: rfkill-unblock@.service +# Source51: blkid.conf ## ## util-linux patches @@ -173,26 +176,15 @@ Provides: fsck-with-dev-lock = %{version} Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions Recommends: %{name}-lang = %{version} -Provides: eject = 2.1.0-166.8 -Provides: login = 4.0-33.7 +Provides: eject = 2.1.0 +Provides: login = 4.0 Provides: rfkill = 0.5 # File conflict of eject (up to 12.3 and SLE11). -Obsoletes: eject < 2.1.0-166.8 +Obsoletes: eject <= 2.1.0 # File conflict of login (up to 12.1 and SLE11). -Obsoletes: login < 4.0-33.7 +Obsoletes: login <= 4.0 # File confluct (man page) of rfkill (up to Leap 15 and SLE 15). Obsoletes: rfkill <= 0.5 -# File conflict of su and kill (up to 12.3 and SLE11). -# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. -Conflicts: coreutils < 8.21 -%if 0%{?suse_version} < 1330 -# File conflict of sulogin and utmpdump (up to 12.3 and SLE11). -Conflicts: sysvinit-tools < 2.88+-87 -%endif -# rfkill conflicts of completion files with <= Leap 42.3 and < SLE15. -Conflicts: bash-completion <= 2.7-1.3 -# The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775) -Conflicts: systemd-presets-branding < 12.2 # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -200,16 +192,7 @@ Provides: s390-32 %endif # uuid-runtime appeared in SLE11 SP1 to SLE11 SP3 Provides: uuid-runtime = %{version}-%{release} -Obsoletes: uuid-runtime < %{version}-%{release} -%if 0%{?suse_version} < 1330 -#BEGIN sysv compatibility hack -# After migration of raw init script to systemd, util-linux no more depends on -# fillup and insserv. Many poorly written packages implicitly depend on them -# without declaring it. Keep these dependencies in Leap 42 + SLE 12 line to -# prevent failures. -PreReq: %insserv_prereq %fillup_prereq -#END sysv compatibility hack -%endif +Obsoletes: uuid-runtime <= 2.19.1 # # Using "Requires" here would lend itself to help upgrading, but since # util-linux is in the initial bootstrap, that is not a good thing to do: @@ -655,6 +638,8 @@ pushd ../klogconsole # klogconsole install make install DEST=%{buildroot} popd +install -Dm644 %{SOURCE41} %{buildroot}%{_unitdir}/rfkill-block@.service +install -Dm644 %{SOURCE42} %{buildroot}%{_unitdir}/rfkill-unblock@.service %endif # # util-linux install @@ -789,9 +774,11 @@ ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim %if %build_util_linux %pre %{service_add_pre raw.service} +%service_add_pre rfkill-block@.service rfkill-unblock@.service %post %{service_add_post raw.service} +%service_add_post rfkill-block@.service rfkill-unblock@.service %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux @@ -814,9 +801,11 @@ done %preun %{service_del_preun raw.service} +%service_del_preun rfkill-block@.service rfkill-unblock@.service %postun %{service_del_postun raw.service} +%service_del_postun rfkill-block@.service rfkill-unblock@.service %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount @@ -902,6 +891,8 @@ getent passwd uuidd >/dev/null || \ %doc Documentation/mount.txt %doc Documentation/pg.txt %{_unitdir}/raw.service +%{_unitdir}/rfkill-block@.service +%{_unitdir}/rfkill-unblock@.service %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/blkid.conf diff --git a/util-linux.changes b/util-linux.changes index fefdce9..41cc10d 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 12 13:49:36 CET 2018 - sbrabec@suse.com + +- Integrate rfkill-block@.service and rfkill-unblock@.service from + rfkill package (boo#1074250#c4). +- Remove unneeded release based conflicts and obsolescences + (boo#1074250#c18). +- Remove sysvinit requirement. + ------------------------------------------------------------------- Mon Jan 1 10:32:51 UTC 2018 - antoine.belvire@opensuse.org diff --git a/util-linux.spec b/util-linux.spec index 898c688..1c2727a 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -149,6 +149,9 @@ Source28: mkzimage_cmdline.8 Source29: mkzimage_cmdline.c Source31: addnote.c # +Source41: rfkill-block@.service +Source42: rfkill-unblock@.service +# Source51: blkid.conf ## ## util-linux patches @@ -173,26 +176,15 @@ Provides: fsck-with-dev-lock = %{version} Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions Recommends: %{name}-lang = %{version} -Provides: eject = 2.1.0-166.8 -Provides: login = 4.0-33.7 +Provides: eject = 2.1.0 +Provides: login = 4.0 Provides: rfkill = 0.5 # File conflict of eject (up to 12.3 and SLE11). -Obsoletes: eject < 2.1.0-166.8 +Obsoletes: eject <= 2.1.0 # File conflict of login (up to 12.1 and SLE11). -Obsoletes: login < 4.0-33.7 +Obsoletes: login <= 4.0 # File confluct (man page) of rfkill (up to Leap 15 and SLE 15). Obsoletes: rfkill <= 0.5 -# File conflict of su and kill (up to 12.3 and SLE11). -# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. -Conflicts: coreutils < 8.21 -%if 0%{?suse_version} < 1330 -# File conflict of sulogin and utmpdump (up to 12.3 and SLE11). -Conflicts: sysvinit-tools < 2.88+-87 -%endif -# rfkill conflicts of completion files with <= Leap 42.3 and < SLE15. -Conflicts: bash-completion <= 2.7-1.3 -# The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775) -Conflicts: systemd-presets-branding < 12.2 # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -200,16 +192,7 @@ Provides: s390-32 %endif # uuid-runtime appeared in SLE11 SP1 to SLE11 SP3 Provides: uuid-runtime = %{version}-%{release} -Obsoletes: uuid-runtime < %{version}-%{release} -%if 0%{?suse_version} < 1330 -#BEGIN sysv compatibility hack -# After migration of raw init script to systemd, util-linux no more depends on -# fillup and insserv. Many poorly written packages implicitly depend on them -# without declaring it. Keep these dependencies in Leap 42 + SLE 12 line to -# prevent failures. -PreReq: %insserv_prereq %fillup_prereq -#END sysv compatibility hack -%endif +Obsoletes: uuid-runtime <= 2.19.1 # # Using "Requires" here would lend itself to help upgrading, but since # util-linux is in the initial bootstrap, that is not a good thing to do: @@ -655,6 +638,8 @@ pushd ../klogconsole # klogconsole install make install DEST=%{buildroot} popd +install -Dm644 %{SOURCE41} %{buildroot}%{_unitdir}/rfkill-block@.service +install -Dm644 %{SOURCE42} %{buildroot}%{_unitdir}/rfkill-unblock@.service %endif # # util-linux install @@ -789,9 +774,11 @@ ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim %if %build_util_linux %pre %{service_add_pre raw.service} +%service_add_pre rfkill-block@.service rfkill-unblock@.service %post %{service_add_post raw.service} +%service_add_post rfkill-block@.service rfkill-unblock@.service %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux @@ -814,9 +801,11 @@ done %preun %{service_del_preun raw.service} +%service_del_preun rfkill-block@.service rfkill-unblock@.service %postun %{service_del_postun raw.service} +%service_del_postun rfkill-block@.service rfkill-unblock@.service %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount @@ -902,6 +891,8 @@ getent passwd uuidd >/dev/null || \ %doc Documentation/mount.txt %doc Documentation/pg.txt %{_unitdir}/raw.service +%{_unitdir}/rfkill-block@.service +%{_unitdir}/rfkill-unblock@.service %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/blkid.conf