From 50b0c730e5b7a129f8e0f1ea515d400c5ea746561ecdf0cac8712f89c184b105 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.com>
Date: Tue, 22 May 2018 15:37:10 +0000
Subject: [PATCH] Accepting request 611230 from
 home:scarabeus_iv:branches:Base:System

- Do not run rfkill-block@.service and rfkill-unblock@service as it
  is just template without parameter bsc#1092820 bsc#1093176

- Do not run rfkill-block@.service and rfkill-unblock@service as it
  is just template without parameter bsc#1092820 bsc#1093176

- Do not run rfkill-block@.service and rfkill-unblock@service as it
  is just template without parameter bsc#1092820 bsc#1093176

OBS-URL: https://build.opensuse.org/request/show/611230
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=374
---
 python-libmount.changes    |  6 ++++++
 python-libmount.spec       | 16 ++++++++--------
 util-linux-systemd.changes |  6 ++++++
 util-linux-systemd.spec    | 16 ++++++++--------
 util-linux.changes         |  6 ++++++
 util-linux.spec            | 16 ++++++++--------
 6 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/python-libmount.changes b/python-libmount.changes
index b936d23..9c77859 100644
--- a/python-libmount.changes
+++ b/python-libmount.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 22 11:54:13 UTC 2018 - tchvatal@suse.com
+
+- Do not run rfkill-block@.service and rfkill-unblock@service as it
+  is just template without parameter bsc#1092820 bsc#1093176
+
 -------------------------------------------------------------------
 Thu Apr 12 17:09:30 CEST 2018 - sbrabec@suse.com
 
diff --git a/python-libmount.spec b/python-libmount.spec
index deb5e2e..ceb46b8 100644
--- a/python-libmount.spec
+++ b/python-libmount.spec
@@ -787,7 +787,7 @@ ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim
 
 %if %build_util_linux
 %pre
-%service_add_pre raw.service rfkill-block@.service rfkill-unblock@.service
+%service_add_pre raw.service
 # Check whether we are upgrading from < Leap 15 or SLE 15
 # Check for /sbin/su and not /usr/sbin/su, as it exists in all old versions.
 # (bsc#353876#c7)
@@ -796,7 +796,7 @@ if test -e /bin/su && ! ( LANG=C su --help 2>/dev/null) | grep -q -- --pty ; the
 fi
 
 %post
-%service_add_post raw.service rfkill-block@.service rfkill-unblock@.service
+%service_add_post raw.service
 %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
 %set_permissions %{_bindir}/su
 # Safely migrate PAM files from coreutils to util-linux
@@ -832,10 +832,10 @@ fi
 rm -f %{_sysconfdir}/default/su.needs_ALWAYS_SET_ROOT
 
 %preun
-%service_del_preun raw.service rfkill-block@.service rfkill-unblock@.service
+%service_del_preun raw.service
 
 %postun
-%service_del_postun raw.service rfkill-block@.service rfkill-unblock@.service
+%service_del_postun raw.service
 
 %verifyscript
 %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount
@@ -868,16 +868,16 @@ rm -f %{_sysconfdir}/default/su.needs_ALWAYS_SET_ROOT
 # fstrim(8) and fstrim.service are from different packages. But it's a oneshot
 # service (timer), no restart needed on binary updates (unless path is changed).
 %pre -n util-linux-systemd
-%{service_add_pre fstrim.service fstrim.timer}
+%service_add_pre fstrim.service fstrim.timer
 
 %post -n util-linux-systemd
-%{service_add_post fstrim.service fstrim.timer}
+%service_add_post fstrim.service fstrim.timer
 
 %preun -n util-linux-systemd
-%{service_del_preun fstrim.service fstrim.timer}
+%service_del_preun fstrim.service fstrim.timer
 
 %postun -n util-linux-systemd
-%{service_del_postun fstrim.service fstrim.timer}
+%service_del_postun fstrim.service fstrim.timer
 
 %if 0%{?suse_version} >= 1330
 %pre -n uuidd
diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes
index b936d23..9c77859 100644
--- a/util-linux-systemd.changes
+++ b/util-linux-systemd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 22 11:54:13 UTC 2018 - tchvatal@suse.com
+
+- Do not run rfkill-block@.service and rfkill-unblock@service as it
+  is just template without parameter bsc#1092820 bsc#1093176
+
 -------------------------------------------------------------------
 Thu Apr 12 17:09:30 CEST 2018 - sbrabec@suse.com
 
diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec
index f0f866e..03cf088 100644
--- a/util-linux-systemd.spec
+++ b/util-linux-systemd.spec
@@ -787,7 +787,7 @@ ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim
 
 %if %build_util_linux
 %pre
-%service_add_pre raw.service rfkill-block@.service rfkill-unblock@.service
+%service_add_pre raw.service
 # Check whether we are upgrading from < Leap 15 or SLE 15
 # Check for /sbin/su and not /usr/sbin/su, as it exists in all old versions.
 # (bsc#353876#c7)
@@ -796,7 +796,7 @@ if test -e /bin/su && ! ( LANG=C su --help 2>/dev/null) | grep -q -- --pty ; the
 fi
 
 %post
-%service_add_post raw.service rfkill-block@.service rfkill-unblock@.service
+%service_add_post raw.service
 %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
 %set_permissions %{_bindir}/su
 # Safely migrate PAM files from coreutils to util-linux
@@ -832,10 +832,10 @@ fi
 rm -f %{_sysconfdir}/default/su.needs_ALWAYS_SET_ROOT
 
 %preun
-%service_del_preun raw.service rfkill-block@.service rfkill-unblock@.service
+%service_del_preun raw.service
 
 %postun
-%service_del_postun raw.service rfkill-block@.service rfkill-unblock@.service
+%service_del_postun raw.service
 
 %verifyscript
 %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount
@@ -868,16 +868,16 @@ rm -f %{_sysconfdir}/default/su.needs_ALWAYS_SET_ROOT
 # fstrim(8) and fstrim.service are from different packages. But it's a oneshot
 # service (timer), no restart needed on binary updates (unless path is changed).
 %pre -n util-linux-systemd
-%{service_add_pre fstrim.service fstrim.timer}
+%service_add_pre fstrim.service fstrim.timer
 
 %post -n util-linux-systemd
-%{service_add_post fstrim.service fstrim.timer}
+%service_add_post fstrim.service fstrim.timer
 
 %preun -n util-linux-systemd
-%{service_del_preun fstrim.service fstrim.timer}
+%service_del_preun fstrim.service fstrim.timer
 
 %postun -n util-linux-systemd
-%{service_del_postun fstrim.service fstrim.timer}
+%service_del_postun fstrim.service fstrim.timer
 
 %if 0%{?suse_version} >= 1330
 %pre -n uuidd
diff --git a/util-linux.changes b/util-linux.changes
index b936d23..9c77859 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 22 11:54:13 UTC 2018 - tchvatal@suse.com
+
+- Do not run rfkill-block@.service and rfkill-unblock@service as it
+  is just template without parameter bsc#1092820 bsc#1093176
+
 -------------------------------------------------------------------
 Thu Apr 12 17:09:30 CEST 2018 - sbrabec@suse.com
 
diff --git a/util-linux.spec b/util-linux.spec
index e8b2986..68d33fc 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -787,7 +787,7 @@ ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim
 
 %if %build_util_linux
 %pre
-%service_add_pre raw.service rfkill-block@.service rfkill-unblock@.service
+%service_add_pre raw.service
 # Check whether we are upgrading from < Leap 15 or SLE 15
 # Check for /sbin/su and not /usr/sbin/su, as it exists in all old versions.
 # (bsc#353876#c7)
@@ -796,7 +796,7 @@ if test -e /bin/su && ! ( LANG=C su --help 2>/dev/null) | grep -q -- --pty ; the
 fi
 
 %post
-%service_add_post raw.service rfkill-block@.service rfkill-unblock@.service
+%service_add_post raw.service
 %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
 %set_permissions %{_bindir}/su
 # Safely migrate PAM files from coreutils to util-linux
@@ -832,10 +832,10 @@ fi
 rm -f %{_sysconfdir}/default/su.needs_ALWAYS_SET_ROOT
 
 %preun
-%service_del_preun raw.service rfkill-block@.service rfkill-unblock@.service
+%service_del_preun raw.service
 
 %postun
-%service_del_postun raw.service rfkill-block@.service rfkill-unblock@.service
+%service_del_postun raw.service
 
 %verifyscript
 %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount
@@ -868,16 +868,16 @@ rm -f %{_sysconfdir}/default/su.needs_ALWAYS_SET_ROOT
 # fstrim(8) and fstrim.service are from different packages. But it's a oneshot
 # service (timer), no restart needed on binary updates (unless path is changed).
 %pre -n util-linux-systemd
-%{service_add_pre fstrim.service fstrim.timer}
+%service_add_pre fstrim.service fstrim.timer
 
 %post -n util-linux-systemd
-%{service_add_post fstrim.service fstrim.timer}
+%service_add_post fstrim.service fstrim.timer
 
 %preun -n util-linux-systemd
-%{service_del_preun fstrim.service fstrim.timer}
+%service_del_preun fstrim.service fstrim.timer
 
 %postun -n util-linux-systemd
-%{service_del_postun fstrim.service fstrim.timer}
+%service_del_postun fstrim.service fstrim.timer
 
 %if 0%{?suse_version} >= 1330
 %pre -n uuidd