Attachment 607168 Details for Bug 850243 – 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.09 KB, created by Václav Pavlín on 2012-08-27 09:13:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Václav Pavlín

Created: 2012-08-27 09:13:56 UTC

Size: 2.09 KB

patch

obsolete

>diff --git a/openerp.spec b/openerp.spec
>index 283263a..31d335e 100644
>--- a/openerp.spec
>+++ b/openerp.spec
>@@ -4,7 +4,7 @@
> 
> Name:       openerp
> Version:    6.1
>-Release:    2%{?dist}
>+Release:    3%{?dist}
>             # See LICENSING
> License:    AGPLv3 and GPLv3 and BSD and LGPLv2+
> Group:      System Environment/Daemons
>@@ -201,28 +201,42 @@ getent passwd openerp >/dev/null || \
> usermod -d /var/run/openerp openerp >/dev/null 2>&1 || :
> 
> %post
>-if [ $1 -eq 1 ] ; then
>-    # Initial installation
>-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>-fi
>+%if %{?fedora}0 > 170 || %{?rhel}0 > 60
>+  %systemd_post openerp.service
>+%else
>+  if [ $1 -eq 1 ] ; then
>+      # Initial installation
>+      /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>+  fi
>+%endif
> 
> %preun
>-if [ $1 -eq 0 ] ; then
>-    # Package removal, not upgrade
>-    /bin/systemctl --no-reload disable \
>-        openerp.service > /dev/null 2>&1 || :
>-    /bin/systemctl stop openerp.service > /dev/null 2>&1 || :
>-fi
>+%if %{?fedora}0 > 170 || %{?rhel}0 > 60
>+  %systemd_preun openerp.service
>+%else
>+  if [ $1 -eq 0 ] ; then
>+      # Package removal, not upgrade
>+      /bin/systemctl --no-reload disable \
>+          openerp.service > /dev/null 2>&1 || :
>+      /bin/systemctl stop openerp.service > /dev/null 2>&1 || :
>+  fi
>+%endif
> 
> %postun
>-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
>-if [ $1 -ge 1 ] ; then
>-    # Package upgrade, not uninstall
>-    /bin/systemctl try-restart openrep-server.service >/dev/null 2>&1 || :
>-fi
>-
>+%if %{?fedora}0 > 170 || %{?rhel}0 > 60
>+  %systemd_postun_with_restart openerp.service
>+%else
>+  /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>+  if [ $1 -ge 1 ] ; then
>+      # Package upgrade, not uninstall
>+      /bin/systemctl try-restart openrep-server.service >/dev/null 2>&1 || :
>+  fi
>+%endif
> 
> %changelog
>+* Mon Aug 27 2012 VÃ¡clav PavlÃn <vpavlin@redhat.com> - 6.1-3
>+- Added systemd macros with condition for F18 and RHEL7 (#850243)
>+
> * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.1-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 850243: 607168