Update to version 2.0 from upstream

- Convert to use of systemd-rpm macros
- Build with PIE flags

.gitignore

@@ -1 +1 @@
-/hostapd-1.0.tar.gz
+/hostapd-2.0.tar.gz

hostapd.spec

@@ -1,6 +1,6 @@
 Name:           hostapd
-Version:        1.0
+Version:        2.0
-Release:        4%{?dist}
+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(post): systemd
-#Requires(preun): chkconfig
+Requires(preun): systemd
-## This is for /sbin/service
+Requires(postun): systemd
-#Requires(preun): initscripts
+
-Requires(post): systemd-units
+%global _hardened_build 1
-Requires(preun): systemd-units
-Requires(postun): systemd-units
 
 %description
 hostapd is a user space daemon for access point and authentication
@@ -132,29 +130,13 @@ rm -rf %{buildroot}
 
 
 %post
-#/sbin/chkconfig --add %{name}
+%systemd_post hostapd.service
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
 
 %preun
-#if [ $1 = 0 ]; then
+%systemd_preun hostapd.service
-#        /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
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%systemd_postun_with_restart hostapd.service
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart hostapd.service >/dev/null 2>&1 || :
-fi
 
 %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@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@lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

sources

@@ -1 +1 @@
-236247a7bbd4f60d5fa3e99849d1ffc9  hostapd-1.0.tar.gz
+ba22e639bc57aa4035d2ea8ffa9bbbee  hostapd-2.0.tar.gz