Attachment 607918 Details for Bug 850057 – Patch adds systemd macros with condition for F18 and RHEL7

[patch] Patch adds systemd macros with condition for F18 and RHEL7

new-systemd-macros.patch (text/plain), 2.45 KB, created by Václav Pavlín on 2012-08-29 14:17:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Václav Pavlín

Created: 2012-08-29 14:17:38 UTC

Size: 2.45 KB

patch

obsolete

>diff --git a/certmonger.spec b/certmonger.spec
>index 168f825..0e25e24 100644
>--- a/certmonger.spec
>+++ b/certmonger.spec
>@@ -1,3 +1,9 @@
>+%if 0%{?fedora} > 17 || 0%{?rhel} > 6
>+%global presets 1
>+%else
>+%global presets 0
>+%endif
>+
> %if 0%{?fedora} > 15 || 0%{?rhel} > 6
> %global systemd 1
> %global	sysvinit 0
>@@ -20,7 +26,7 @@
> 
> Name:		certmonger
> Version:	0.59
>-Release:	2%{?dist}
>+Release:	3%{?dist}
> Summary:	Certificate status monitor and PKI enrollment client
> 
> Group:		System Environment/Daemons
>@@ -127,9 +133,13 @@ if test $1 -eq 1 ; then
> 	killall -HUP dbus-daemon 2>&1 > /dev/null
> fi
> %if %{systemd}
>-if test $1 -eq 1 ; then
>-	/bin/systemctl daemon-reload >/dev/null 2>&1 || :
>-fi
>+        %if %{presets}
>+                %systemd_post certmonger.service
>+        %else
>+                if test $1 -eq 1 ; then
>+                        /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>+                fi
>+        %endif
> %endif
> %if %{sysvinit}
> /sbin/chkconfig --add certmonger
>@@ -137,10 +147,14 @@ fi
> 
> %postun
> %if %{systemd}
>-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
>-if [ $1 -ge 1 ] ; then
>-	/bin/systemctl try-restart certmonger.service >/dev/null 2>&1 || :
>-fi
>+        %if %{presets}
>+                %systemd_postun_with_restart certmonger.service
>+        %else
>+                /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>+                if [ $1 -ge 1 ] ; then
>+                        /bin/systemctl try-restart certmonger.service >/dev/null 2>&1 || :
>+                fi
>+        %endif
> %endif
> %if %{sysvinit}
> if test $1 -gt 0 ; then
>@@ -151,8 +165,14 @@ exit 0
> 
> %preun
> %if %{systemd}
>-	/bin/systemctl --no-reload disable certmonger.service > /dev/null 2>&1 || :
>-	/bin/systemctl stop certmonger.service > /dev/null 2>&1 || :
>+        %if %{presets}
>+                %systemd_preun certmonger.service
>+        %else
>+                if [ $1 -eq 0 ] ; then
>+        	        /bin/systemctl --no-reload disable certmonger.service > /dev/null 2>&1 || :
>+                	/bin/systemctl stop certmonger.service > /dev/null 2>&1 || :
>+                fi
>+        %endif
> %endif
> %if %{sysvinit}
> if test $1 -eq 0 ; then
>@@ -199,6 +219,9 @@ exit 0
> %endif
> 
> %changelog
>+* Wed Aug 29 2012 VÃ¡clav PavlÃn <vpavlin@redhat.com> - 0.59-3
>+- Added systemd macros with condition for F18 and RHEL7 (#850057)
>+
> * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.59-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 850057: 607918