Attachment 632735 Details for Bug 850191 – Patch replaces scriptlets with new systemd macros

[patch] Patch replaces scriptlets with new systemd macros

new-systemd-macros.patch (text/plain), 2.25 KB, created by Václav Pavlín on 2012-10-24 12:17:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Václav Pavlín

Created: 2012-10-24 12:17:21 UTC

Size: 2.25 KB

patch

obsolete

>diff --git a/lirc.spec b/lirc.spec
>index ff69211..823382e 100644
>--- a/lirc.spec
>+++ b/lirc.spec
>@@ -24,9 +24,9 @@
> Name:           lirc
> Version:        0.9.0
> %if 0%{?released}
>-Release:        10%{?dist}
>+Release:        11%{?dist}
> %else
>-Release:        0.1.%{pre}%{?dist}
>+Release:        0.2.%{pre}%{?dist}
> %endif
> Summary:        The Linux Infrared Remote Control package
> 
>@@ -71,9 +71,9 @@ BuildRequires:  iguanaIR-devel
> Requires:       %{name}-libs = %{version}-%{release}
> Requires(post): /sbin/ldconfig
> Requires(postun): /sbin/ldconfig
>-Requires(post): systemd-units
>-Requires(preun): systemd-units
>-Requires(postun): systemd-units
>+Requires(post): systemd
>+Requires(preun): systemd
>+Requires(postun): systemd
> #for triggerun
> Requires(post): systemd-sysv
> 
>@@ -246,10 +246,7 @@ rm -rf $RPM_BUILD_ROOT
> 
> 
> %post
>-if [ $1 -eq 1 ] ; then 
>-    # Initial installation 
>-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>-fi
>+%systemd_post lirc.service lircmd.service
> # If we're upgrading, move config files into their new location, if need be
> if [ $1 -ge 2 ] ; then
>   if [ -e %{_sysconfdir}/lircd.conf -a ! -e %{_sysconfdir}/lirc/lircd.conf ]; then
>@@ -263,21 +260,10 @@ fi
> %post libs -p /sbin/ldconfig
> 
> %preun
>-if [ $1 -eq 0 ] ; then
>-    # Package removal, not upgrade
>-    /bin/systemctl --no-reload disable lirc.service > /dev/null 2>&1 || :
>-    /bin/systemctl stop lirc.service > /dev/null 2>&1 || :
>-    /bin/systemctl --no-reload disable lircmd.service > /dev/null 2>&1 || :
>-    /bin/systemctl stop lircmd.service > /dev/null 2>&1 || :
>-fi
>+%systemd_preun lirc.service lircmd.service
> 
> %postun
>-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
>-if [ $1 -ge 1 ] ; then
>-    # Package upgrade, not uninstall
>-    /bin/systemctl try-restart lirc.service >/dev/null 2>&1 || :
>-    /bin/systemctl try-restart lircmd.service >/dev/null 2>&1 || :
>-fi
>+%systemd_postun_with_restart lirc.service lircmd.service
> 
> 
> %postun libs -p /sbin/ldconfig
>@@ -334,6 +320,9 @@ fi
> 
> 
> %changelog
>+* Wed Oct 24 2012 VÃ¡clav PavlÃn <vpavlin@redhat.com> - 0.9.0-11
>+- Scriptlets replaced with new systemd macros (#850191)
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-10
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 850191: 632735