Attachment 613916 Details for Bug 850166 – 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.37 KB, created by Václav Pavlín on 2012-09-18 08:59:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Václav Pavlín

Created: 2012-09-18 08:59:43 UTC

Size: 2.37 KB

patch

obsolete

>diff --git a/iptables.spec b/iptables.spec
>index f5cb397..0137a7e 100644
>--- a/iptables.spec
>+++ b/iptables.spec
>@@ -12,6 +12,13 @@
>     %define script_path /etc/rc.d/init.d
> %endif
> 
>+# with systemd presets
>+%if 0%{?fedora} > 17 && 0%{?rhel} > 6
>+    %bcond_without presets
>+%else
>+    %bcond_with presets
>+%endif
>+
> # default service
> %if 0%{?fedora} < 18 && 0%{?rhel} < 7
>     %bcond_without default_service
>@@ -22,7 +29,7 @@
> Name: iptables
> Summary: Tools for managing Linux kernel packet filtering capabilities
> Version: 1.4.14
>-Release: 3%{?dist}
>+Release: 4%{?dist}
> Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
> Source1: iptables.init
> Source2: iptables-config
>@@ -132,6 +139,9 @@ rm -rf %{buildroot}
> 
> %post
> /sbin/ldconfig
>+%if %{with presets}
>+   %systemd_post iptables.service ip6tables.service
>+%else
> if [ $1 -eq 1 ] ; then # Initial installation
>    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
> %if %{with default_service}
>@@ -139,22 +149,32 @@ if [ $1 -eq 1 ] ; then # Initial installation
>    /bin/systemctl enable ip6tables.service >/dev/null 2>&1 || :
> %endif
> fi
>+%endif
>+
> 
> %preun
>+%if %{with presets}
>+   %systemd_preun iptables.service ip6tables.service
>+%else
> if [ $1 -eq 0 ]; then # Package removal, not upgrade
>    /bin/systemctl --no-reload disable iptables.service > /dev/null 2>&1 || :
>    /bin/systemctl --no-reload disable ip6tables.service > /dev/null 2>&1 || :
>    /bin/systemctl stop iptables.service > /dev/null 2>&1 || :
>    /bin/systemctl stop ip6tables.service > /dev/null 2>&1 || :
> fi
>+%endif
> 
> %postun
> /sbin/ldconfig
>+%if %{with presets}
>+   %systemd_postun_with_restart iptables.service ip6tables.service
>+%else
> /bin/systemctl daemon-reload >/dev/null 2>&1 || :
> if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall
>    /bin/systemctl try-restart iptables.service >/dev/null 2>&1 || :
>    /bin/systemctl try-restart ip6tables.service >/dev/null 2>&1 || :
> fi
>+%endif
> 
> %triggerun -- iptables < 1.4.11.1-3
> # To apply saved runlevel, use systemd-sysv-convert --apply iptables
>@@ -242,6 +262,9 @@ fi
> %{_libdir}/pkgconfig/xtables.pc
> 
> %changelog
>+* Tue Sep 18 2012 VÃ¡clav PavlÃn <vpavlin@redhat.com> - 1.4.14-4
>+- New systemd macros added for F18+ and RHEL7+ (#850166)
>+
> * Wed Jul 18 2012 Thomas Woerner <twoerner@redhat.com> 1.4.14-3
> - added fixrestore patch submitted to upstream by fryasu (nfbz#774) 
>   (RHBZ#825796)

Actions: View | Diff

Attachments on bug 850166: 613916