Attachment 662416 Details for Bug 850369 – Patch replaces scriptlets with new systemd macros

[patch] Patch replaces scriptlets with new systemd macros

macro.patch (text/plain), 1.91 KB, created by Lukáš Nykrýn on 2012-12-12 15:34:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lukáš Nykrýn

Created: 2012-12-12 15:34:37 UTC

Size: 1.91 KB

patch

obsolete

>diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
>index 1c11a20..c8fd3ca 100644
>--- a/wpa_supplicant.spec
>+++ b/wpa_supplicant.spec
>@@ -5,7 +5,7 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant
> Name: wpa_supplicant
> Epoch: 1
> Version: 1.0
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> License: BSD
> Group: System Environment/Base
> Source0: http://w1.fi/releases/%{name}-%{version}%{rcver}%{snapshot}.tar.gz
>@@ -55,9 +55,9 @@ BuildRequires: dbus-devel
> BuildRequires: libnl3-devel
> BuildRequires: systemd-units
> Requires(post): systemd-sysv
>-Requires(post): systemd-units
>-Requires(preun): systemd-units
>-Requires(postun): systemd-units
>+Requires(post): systemd
>+Requires(preun): systemd
>+Requires(postun): systemd
> 
> %description
> wpa_supplicant is a WPA Supplicant for Linux, BSD and Windows with support
>@@ -167,24 +167,13 @@ pushd wpa_supplicant
> popd
> 
> %post
>-if [ $1 -eq 1 ] ; then 
>-    # Initial installation 
>-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>-fi
>+%systemd_post wpa_supplicant.service
> 
> %preun
>-if [ $1 -eq 0 ] ; then
>-    # Package removal, not upgrade
>-    /bin/systemctl --no-reload disable wpa_supplicant.service > /dev/null 2>&1 || :
>-    /bin/systemctl stop wpa_supplicant.service > /dev/null 2>&1 || :
>-fi
>+%systemd_preun wpa_supplicant.service
> 
> %postun
>-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
>-if [ $1 -ge 1 ] ; then
>-    # Package upgrade, not uninstall
>-    /bin/systemctl try-restart wpa_supplicant.service >/dev/null 2>&1 || :
>-fi
>+%systemd_postun_with_restart wpa_supplicant.service
> 
> %triggerun -- wpa_supplicant < 0.7.3-10
> # Save the current service runlevel info
>@@ -232,6 +221,9 @@ fi
> %postun -n libeap -p /sbin/ldconfig
> 
> %changelog
>+* Wed Dec 12 2012 LukÃ¡Å¡ NykrÃ½n <lnykryn@redhat.com> - 1:1.0-2
>+- Scriptlets replaced with new systemd macros (#850369)
>+
> * Thu Aug 29 2012 Dan Williams <dcbw@redhat.com> - 1:1.0-1
> - Enable lightweight AP mode support
> - Enable P2P (WiFi Direct) support

Actions: View | Diff

Attachments on bug 850369: 662416