From 38603b180cb3e2976c2a5d6fde798b7040e90004a97619820460cc917a425a37 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 23 Jan 2018 12:05:34 +0000 Subject: [PATCH] Accepting request 567993 from home:jengelh:branches:Base:System - Combine %service_* calls again. OBS-URL: https://build.opensuse.org/request/show/567993 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=360 --- python-libmount.changes | 5 +++++ python-libmount.spec | 12 ++++-------- util-linux-systemd.changes | 5 +++++ util-linux-systemd.spec | 12 ++++-------- util-linux.changes | 5 +++++ util-linux.spec | 12 ++++-------- 6 files changed, 27 insertions(+), 24 deletions(-) diff --git a/python-libmount.changes b/python-libmount.changes index 28a4bd8..79db2f4 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jan 21 20:15:00 UTC 2018 - jengelh@inai.de + +- Combine %service_* calls again. + ------------------------------------------------------------------- Thu Jan 18 01:54:42 UTC 2018 - bwiedemann@suse.com diff --git a/python-libmount.spec b/python-libmount.spec index 052d48d..9ad81b7 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -779,12 +779,10 @@ 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 +%service_add_pre raw.service rfkill-block@.service rfkill-unblock@.service %post -%{service_add_post raw.service} -%service_add_post rfkill-block@.service rfkill-unblock@.service +%service_add_post raw.service 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 @@ -806,12 +804,10 @@ for PAM_FILE in default/su pam.d/su pam.d/su-l ; do done %preun -%{service_del_preun raw.service} -%service_del_preun rfkill-block@.service rfkill-unblock@.service +%service_del_preun raw.service rfkill-block@.service rfkill-unblock@.service %postun -%{service_del_postun raw.service} -%service_del_postun rfkill-block@.service rfkill-unblock@.service +%service_del_postun raw.service rfkill-block@.service rfkill-unblock@.service %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 28a4bd8..79db2f4 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jan 21 20:15:00 UTC 2018 - jengelh@inai.de + +- Combine %service_* calls again. + ------------------------------------------------------------------- Thu Jan 18 01:54:42 UTC 2018 - bwiedemann@suse.com diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 83ed552..03dd714 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -778,12 +778,10 @@ 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 +%service_add_pre raw.service rfkill-block@.service rfkill-unblock@.service %post -%{service_add_post raw.service} -%service_add_post rfkill-block@.service rfkill-unblock@.service +%service_add_post raw.service 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 @@ -805,12 +803,10 @@ for PAM_FILE in default/su pam.d/su pam.d/su-l ; do done %preun -%{service_del_preun raw.service} -%service_del_preun rfkill-block@.service rfkill-unblock@.service +%service_del_preun raw.service rfkill-block@.service rfkill-unblock@.service %postun -%{service_del_postun raw.service} -%service_del_postun rfkill-block@.service rfkill-unblock@.service +%service_del_postun raw.service rfkill-block@.service rfkill-unblock@.service %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount diff --git a/util-linux.changes b/util-linux.changes index 28a4bd8..79db2f4 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jan 21 20:15:00 UTC 2018 - jengelh@inai.de + +- Combine %service_* calls again. + ------------------------------------------------------------------- Thu Jan 18 01:54:42 UTC 2018 - bwiedemann@suse.com diff --git a/util-linux.spec b/util-linux.spec index 8c18d09..1279d0a 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -778,12 +778,10 @@ 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 +%service_add_pre raw.service rfkill-block@.service rfkill-unblock@.service %post -%{service_add_post raw.service} -%service_add_post rfkill-block@.service rfkill-unblock@.service +%service_add_post raw.service 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 @@ -805,12 +803,10 @@ for PAM_FILE in default/su pam.d/su pam.d/su-l ; do done %preun -%{service_del_preun raw.service} -%service_del_preun rfkill-block@.service rfkill-unblock@.service +%service_del_preun raw.service rfkill-block@.service rfkill-unblock@.service %postun -%{service_del_postun raw.service} -%service_del_postun rfkill-block@.service rfkill-unblock@.service +%service_del_postun raw.service rfkill-block@.service rfkill-unblock@.service %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount