Attachment 662420 Details for Bug 850364 – Patch replaces scriptlets with new systemd macros

[patch] Patch replaces scriptlets with new systemd macros

macro.patch (text/plain), 1.80 KB, created by Lukáš Nykrýn on 2012-12-12 15:44:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lukáš Nykrýn

Created: 2012-12-12 15:44:15 UTC

Size: 1.80 KB

patch

obsolete

>diff --git a/watchdog.spec b/watchdog.spec
>index 6e0fb44..d388c76 100644
>--- a/watchdog.spec
>+++ b/watchdog.spec
>@@ -1,7 +1,7 @@
> Summary:          Software and/or Hardware watchdog daemon
> Name:             watchdog
> Version:          5.12
>-Release:          2%{?dist}
>+Release:          3%{?dist}
> License:          GPL+
> Group:            System Environment/Daemons
> 
>@@ -12,9 +12,9 @@ Source2:          README.watchdog.ipmi
> Source3:          README.Fedora
> Source4:          watchdog.service
> 
>-Requires(post): systemd-units
>-Requires(preun): systemd-units
>-Requires(postun): systemd-units
>+Requires(post): systemd
>+Requires(preun): systemd
>+Requires(postun): systemd
> 
> 
> %description
>@@ -57,26 +57,15 @@ install -Dp -m0644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_unitdir}/watchdog.service
> 
> 
> %post
>-if [ $1 -eq 1 ] ; then 
>-    # Initial installation 
>-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>-fi
>+%systemd_post watchdog.service
> 
> 
> %preun 
>-if [ $1 -eq 0 ] ; then
>-    # Package removal, not upgrade
>-    /bin/systemctl --no-reload disable watchdog.service > /dev/null 2>&1 || :
>-    /bin/systemctl stop watchdog.service > /dev/null 2>&1 || :
>-fi
>+%systemd_preun watchdog.service
> 
> 
> %postun 
>-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
>-if [ $1 -ge 1 ] ; then
>-    # Package upgrade, not uninstall
>-    /bin/systemctl try-restart watchdog.service >/dev/null 2>&1 || :
>-fi
>+%systemd_postun_with_restart watchdog.service
> 
> %triggerun -- watchdog < 5.9-4
> # Save the current service runlevel info
>@@ -104,6 +93,9 @@ fi
> 
> 
> %changelog
>+* Wed Dec 12 2012 LukÃ¡Å¡ NykrÃ½n <lnykryn@redhat.com> - 5.12-3
>+- Scriptlets replaced with new systemd macros (#850364)
>+
> * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.12-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 850364: 662420