From 91d77c4d9050f78446fbb3e25c06965b2706252ab590eecf409da40e651f9000 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 11 Dec 2018 08:41:54 +0000 Subject: [PATCH] Accepting request 656921 from home:sbrabec:branches:Base:System - Drop rfkill-block@.service and rfkill-unblock@.service that functionally conflict with systemd-rfkill@.service (boo#1092820#c13). OBS-URL: https://build.opensuse.org/request/show/656921 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=386 --- python3-libmount.changes | 7 +++++++ python3-libmount.spec | 6 ------ util-linux-systemd.changes | 7 +++++++ util-linux-systemd.spec | 6 ------ util-linux.changes | 7 +++++++ util-linux.spec | 6 ------ 6 files changed, 21 insertions(+), 18 deletions(-) diff --git a/python3-libmount.changes b/python3-libmount.changes index bdde0b2..20e1bf7 100644 --- a/python3-libmount.changes +++ b/python3-libmount.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 10 19:08:35 CET 2018 - sbrabec@suse.com + +- Drop rfkill-block@.service and rfkill-unblock@.service that + functionally conflict with systemd-rfkill@.service + (boo#1092820#c13). + ------------------------------------------------------------------- Wed Nov 21 17:55:03 CET 2018 - sbrabec@suse.com diff --git a/python3-libmount.spec b/python3-libmount.spec index 7c8d31c..8a77397 100644 --- a/python3-libmount.spec +++ b/python3-libmount.spec @@ -140,8 +140,6 @@ Source13: %{_name}.keyring Source14: runuser.pamd Source15: runuser-l.pamd Source16: su-l.pamd -Source41: rfkill-block@.service -Source42: rfkill-unblock@.service # Source51: blkid.conf ## @@ -599,8 +597,6 @@ install -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/pam.d/runuser-l install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su -install -Dm644 %{SOURCE41} %{buildroot}%{_unitdir}/rfkill-block@.service -install -Dm644 %{SOURCE42} %{buildroot}%{_unitdir}/rfkill-unblock@.service %endif # # util-linux install @@ -862,8 +858,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %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-systemd.changes b/util-linux-systemd.changes index bdde0b2..20e1bf7 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 10 19:08:35 CET 2018 - sbrabec@suse.com + +- Drop rfkill-block@.service and rfkill-unblock@.service that + functionally conflict with systemd-rfkill@.service + (boo#1092820#c13). + ------------------------------------------------------------------- Wed Nov 21 17:55:03 CET 2018 - sbrabec@suse.com diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 80406e0..5f124a4 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -140,8 +140,6 @@ Source13: %{_name}.keyring Source14: runuser.pamd Source15: runuser-l.pamd Source16: su-l.pamd -Source41: rfkill-block@.service -Source42: rfkill-unblock@.service # Source51: blkid.conf ## @@ -599,8 +597,6 @@ install -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/pam.d/runuser-l install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su -install -Dm644 %{SOURCE41} %{buildroot}%{_unitdir}/rfkill-block@.service -install -Dm644 %{SOURCE42} %{buildroot}%{_unitdir}/rfkill-unblock@.service %endif # # util-linux install @@ -862,8 +858,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %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 bdde0b2..20e1bf7 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 10 19:08:35 CET 2018 - sbrabec@suse.com + +- Drop rfkill-block@.service and rfkill-unblock@.service that + functionally conflict with systemd-rfkill@.service + (boo#1092820#c13). + ------------------------------------------------------------------- Wed Nov 21 17:55:03 CET 2018 - sbrabec@suse.com diff --git a/util-linux.spec b/util-linux.spec index dd2ad92..1f005ea 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -140,8 +140,6 @@ Source13: %{_name}.keyring Source14: runuser.pamd Source15: runuser-l.pamd Source16: su-l.pamd -Source41: rfkill-block@.service -Source42: rfkill-unblock@.service # Source51: blkid.conf ## @@ -599,8 +597,6 @@ install -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/pam.d/runuser-l install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su -install -Dm644 %{SOURCE41} %{buildroot}%{_unitdir}/rfkill-block@.service -install -Dm644 %{SOURCE42} %{buildroot}%{_unitdir}/rfkill-unblock@.service %endif # # util-linux install @@ -862,8 +858,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %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