- release 2

[packages/hostapd.git] / hostapd.spec

diff --git a/hostapd.spec b/hostapd.spec
index 77504a76e24879c72fe831847a25876fe85f4487..daeb1a8bca6e87e6ea43b42bd211866d119e7147 100644 (file)
--- a/hostapd.spec
+++ b/hostapd.spec
@@ -1,16 +1,15 @@
-#
-# TODO:                check madwifi-ng-devel and madwifi-devel BR
-#
+# TODO
+# - check madwifi-ng-devel and madwifi-devel BR -- ???
 Summary:       HostAP - acts as an access point
 Summary(es.UTF-8):     HostAP - actúa como un punto de acceso
 Summary(pl.UTF-8):     HostAP - praca jako access point
 Name:          hostapd
-Version:       0.6.4
-Release:       1
+Version:       0.7.0
+Release:       2
 License:       GPL v2
 Group:         Daemons
 Source0:       http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 62876f2179f316db0621cc33adf04c19
+# Source0-md5: 04ae8c7dfc895420dcd32992471a15c4
 Source1:       %{name}.init
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-build-time-config.patch
@@ -19,6 +18,7 @@ BuildRequires:        libnl-devel
 BuildRequires: madwifi-ng-devel
 BuildRequires: openssl-devel
 BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: sed >= 4.0
 Requires(post,preun):  /sbin/chkconfig
 Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -60,21 +60,16 @@ IBSS.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%{__sed} '/CFLAGS =/{s/-g//; s/-O2/$(OPTCFLAGS)/}' -i hostapd/Makefile
+%{__sed} '/NOBJS =/s@../src/crypto/rc4.o@../src/utils/wpabuf.o ../src/utils/wpa_debug.o@' -i hostapd/Makefile
 
 %build
 %{__make} -C hostapd \
+       all nt_password_hash hlr_auc_gw \
+       V=1 \
        CC="%{__cc}" \
-       OPT="%{rpmcflags}"
-
-%{__make} -C hostapd \
-       nt_password_hash \
-       CC="%{__cc}" \
-       OPT="%{rpmcflags}"
-
-%{__make} -C hostapd \
-       hlr_auc_gw \
-       CC="%{__cc}" 
-       OPT="%{rpmcflags}"
+       OPTCFLAGS="%{rpmcflags}" \
+       LDFLAGS="%{rpmcflags} %{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -82,23 +77,23 @@ install -d $RPM_BUILD_ROOT{/sbin,%{_sysconfdir}/{hostap,pcmcia}}
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 
 # hostapd hostapd_cli nt_password_hash hlr_auc_gw
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/hostapd
-install hostapd/hostapd $RPM_BUILD_ROOT/sbin
-install hostapd/hostapd_cli $RPM_BUILD_ROOT/sbin
-install hostapd/nt_password_hash $RPM_BUILD_ROOT/sbin
-install hostapd/hlr_auc_gw $RPM_BUILD_ROOT/sbin
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/hostapd
+install -p hostapd/hostapd $RPM_BUILD_ROOT/sbin
+install -p hostapd/hostapd_cli $RPM_BUILD_ROOT/sbin
+install -p hostapd/nt_password_hash $RPM_BUILD_ROOT/sbin
+install -p hostapd/hlr_auc_gw $RPM_BUILD_ROOT/sbin
 
 # hostapd configuration
-install hostapd/hostapd.accept $RPM_BUILD_ROOT%{_sysconfdir}/hostap
-install hostapd/hostapd.conf $RPM_BUILD_ROOT%{_sysconfdir}/hostap
-install hostapd/hostapd.deny $RPM_BUILD_ROOT%{_sysconfdir}/hostap
+cp -a hostapd/hostapd.accept $RPM_BUILD_ROOT%{_sysconfdir}/hostap
+cp -a hostapd/hostapd.conf $RPM_BUILD_ROOT%{_sysconfdir}/hostap
+cp -a hostapd/hostapd.deny $RPM_BUILD_ROOT%{_sysconfdir}/hostap
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add hostapd
-%service hostapd restart "HostAP daemons"
+%service hostapd restart "HostAP Daemon"
 
 %preun
 if [ "$1" = "0" ]; then