Attachment 607422 Details for Bug 850048 – Patch adds systemd macros with condition for F18

[patch] Patch adds systemd macros with condition for F18

new-systemd-macros.patch (text/plain), 1.80 KB, created by Václav Pavlín on 2012-08-28 07:06:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Václav Pavlín

Created: 2012-08-28 07:06:15 UTC

Size: 1.80 KB

patch

obsolete

>diff --git a/bitlbee.spec b/bitlbee.spec
>index f299eb4..750350b 100644
>--- a/bitlbee.spec
>+++ b/bitlbee.spec
>@@ -1,7 +1,7 @@
> Summary:           IRC to other chat networks gateway
> Name:              bitlbee
> Version:           3.0.5
>-Release:           3%{?dist}
>+Release:           4%{?dist}
> License:           GPLv2+ and MIT
> Group:             System Environment/Daemons
> URL:               http://www.bitlbee.org/
>@@ -135,6 +135,10 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_loc
> exit 0
> 
> %post
>+%if 0%{?fedora} >= 18
>+  %systemd_post bitlbee.service
>+%endif
>+
> %if 0%{?fedora} >= 15
> if [ $1 -eq 1 ]; then
>     # Package install, not upgrade
>@@ -143,20 +147,28 @@ fi
> %endif
> 
> %preun
>-%if 0%{?fedora} < 15
>-if [ $1 -eq 0 ]; then
>-	/sbin/service xinetd condrestart > /dev/null 2>&1
>-fi
>+%if 0%{?fedora} >= 18
>+  %systemd_preun bitlbee.service
> %else
>-# Work around RHBZ #655116
>-if [ $1 -eq 0 ] ; then
>+  %if 0%{?fedora} < 15
>+  if [ $1 -eq 0 ]; then
>+	/sbin/service xinetd condrestart > /dev/null 2>&1
>+  fi
>+  %else
>+  # Work around RHBZ #655116
>+  if [ $1 -eq 0 ] ; then
> 	# Package removal, not upgrade
> 	/bin/systemctl disable bitlbee.service > /dev/null 2>&1 || :
> 	/bin/systemctl stop bitlbee.service > /dev/null 2>&1 || :
>-fi
>+  fi
>+  %endif
> %endif
> 
> %postun
>+%if 0%{?fedora} >= 18
>+  %systemd_postun_with_restart bitlbee.service
>+%endif
>+
> %if 0%{?fedora} >= 15
> /bin/systemctl daemon-reload >/dev/null 2>&1 || :
> if [ $1 -ge 1 ] ; then
>@@ -198,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT
> %endif
> 
> %changelog
>+* Tue Aug 28 2012 VÃ¡clav PavlÃn <vpavlin@redhat.com> - 3.0.5-4
>+- New systemd macros added with condition for F18 (#850048)
>+
> * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.5-3
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 850048: 607422