Attachment 607211 Details for Bug 850022 – 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), 1.93 KB, created by Václav Pavlín on 2012-08-27 14:02:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Václav Pavlín

Created: 2012-08-27 14:02:07 UTC

Size: 1.93 KB

patch

obsolete

>diff --git a/aiccu.spec b/aiccu.spec
>index 650da8c..c061d14 100644
>--- a/aiccu.spec
>+++ b/aiccu.spec
>@@ -9,7 +9,7 @@
> Summary:   SixXS Automatic IPv6 Connectivity Client Utility
> Name:      aiccu
> Version:   2007.01.15
>-Release:   15%{?dist}
>+Release:   16%{?dist}
> License:   BSD
> Group:     System Environment/Daemons
> URL:       http://www.sixxs.net/tools/aiccu/
>@@ -58,20 +58,36 @@ mkdir -p $RPM_BUILD_ROOT%{_unitdir}
> install -p %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/
> 
> %post
>-if [ "$1" = "1" ]; then
>-	/bin/systemctl --daemon-reload >/dev/null 2>&1 || :
>-fi
>+%if %{?fedora}0 > 170 || %{?rhel}0 > 60
>+  %systemd_post aiccu.service
>+%else
>+  if [ $1 -eq 1 ] ; then
>+      # Initial installation
>+      /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>+  fi
>+%endif
> 
> %preun
>-if [ "$1" = "0" ]; then
>-	/bin/systemctl disable aiccu.service >/dev/null 2>&1 || :
>-	/bin/systemctl stop aiccu.service >/dev/null 2>&1 || :
>-fi
>+%if %{?fedora}0 > 170 || %{?rhel}0 > 60
>+  %systemd_preun aiccu.service
>+%else
>+  if [ $1 -eq 0 ] ; then
>+      # Package removal, not upgrade
>+      /bin/systemctl disable aiccu.service > /dev/null 2>&1 || :
>+      /bin/systemctl stop aiccu.service > /dev/null 2>&1 || :
>+  fi
>+%endif
> 
> %postun
>-if [ "$1" -ge 1 ]; then
>-   /bin/systemctl try-restart aiccu.service >/dev/null 2>&1 || :   
>-fi
>+%if %{?fedora}0 > 170 || %{?rhel}0 > 60
>+  %systemd_postun_with_restart aiccu.service
>+%else
>+  /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>+  if [ $1 -ge 1 ] ; then
>+      # Package upgrade, not uninstall
>+      /bin/systemctl try-restart aiccu.service >/dev/null 2>&1 || :
>+  fi
>+%endif
> 
> %clean
> make clean
>@@ -87,6 +103,9 @@ make clean
> %{_unitdir}/aiccu.service
> 
> %changelog
>+* Wed Aug 22 2012 VÃ¡clav PavlÃn <vpavlin@redhat.com> - 2007.01.15-16
>+- New systemd macros added with conditions for F18 and RHEL7(#850022)
>+
> * Mon Aug 6 2012 Conrad Meyer <konrad@tylerc.org> - 2007.01.15-15
> - Nix systemd restart as per discussion on #844607
>

Actions: View | Diff

Attachments on bug 850022: 606246 | 607211