[hostapd] Update to version 2.0 from upstream
John W. Linville
linville at fedoraproject.org
Thu May 30 18:10:46 UTC 2013
commit 0995bfd9e2285772050298920e3a1cd363c35a26
Author: John W. Linville <linville at tuxdriver.com>
Date: Thu May 30 14:10:42 2013 -0400
Update to version 2.0 from upstream
- Convert to use of systemd-rpm macros
- Build with PIE flags
.gitignore | 2 +-
hostapd.spec | 43 +++++++++++++++----------------------------
sources | 2 +-
3 files changed, 17 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d4eb81..8765ec2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/hostapd-1.0.tar.gz
+/hostapd-2.0.tar.gz
diff --git a/hostapd.spec b/hostapd.spec
index 04b1d1d..6e39305 100644
--- a/hostapd.spec
+++ b/hostapd.spec
@@ -1,6 +1,6 @@
Name: hostapd
-Version: 1.0
-Release: 4%{?dist}
+Version: 2.0
+Release: 1%{?dist}
Summary: IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
Group: System Environment/Daemons
License: BSD
@@ -17,13 +17,11 @@ BuildRequires: libnl-devel >= 1.1
BuildRequires: openssl-devel
BuildRequires: systemd-units
-#Requires(post): chkconfig
-#Requires(preun): chkconfig
-## This is for /sbin/service
-#Requires(preun): initscripts
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+
+%global _hardened_build 1
%description
hostapd is a user space daemon for access point and authentication
@@ -132,29 +130,13 @@ rm -rf %{buildroot}
%post
-#/sbin/chkconfig --add %{name}
-if [ $1 -eq 1 ] ; then
- # Initial installation
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post hostapd.service
%preun
-#if [ $1 = 0 ]; then
-# /sbin/service %{name} stop >/dev/null 2>&1
-# /sbin/chkconfig --del %{name}
-#fi
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /bin/systemctl --no-reload disable hostapd.service > /dev/null 2>&1 || :
- /bin/systemctl stop hostapd.service > /dev/null 2>&1 || :
-fi
+%systemd_preun hostapd.service
%postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart hostapd.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart hostapd.service
%triggerun -- hostapd < 0.7.3-5
# Save the current service runlevel info
@@ -168,6 +150,11 @@ fi
%changelog
+* Thu May 30 2013 John W. Linville <linville at redhat.com> - 2.0-1
+- Update to version 2.0 from upstream
+- Convert to use of systemd-rpm macros
+- Build with PIE flags
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index de25f64..26ffcc0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-236247a7bbd4f60d5fa3e99849d1ffc9 hostapd-1.0.tar.gz
+ba22e639bc57aa4035d2ea8ffa9bbbee hostapd-2.0.tar.gz
More information about the scm-commits
mailing list