- release 2

[packages/hostapd.git] / hostapd.spec

diff --git a/hostapd.spec b/hostapd.spec
index bbeb78bbcef017a455cf66a985680d2a29f1f1bf..daeb1a8bca6e87e6ea43b42bd211866d119e7147 100644 (file)
--- a/hostapd.spec
+++ b/hostapd.spec
@@ -1,24 +1,25 @@
-#
-# 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
+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.5.7
-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: d5113247dc6ee17106e6bc7cb89aa507
+# Source0-md5: 04ae8c7dfc895420dcd32992471a15c4
 Source1:       %{name}.init
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-build-time-config.patch
 URL:           http://hostap.epitest.fi/
+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:      kernel-net-hostap >= 0.1.2
 Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -59,43 +60,40 @@ 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} \
+%{__make} -C hostapd \
+       all nt_password_hash hlr_auc_gw \
+       V=1 \
        CC="%{__cc}" \
-       OPT="%{rpmcflags}"
-
-%{__make} nt_password_hash \
-       CC="%{__cc}" \
-       OPT="%{rpmcflags}"
-
-%{__make} hlr_auc_gw \
-       CC="%{__cc}" 
-       OPT="%{rpmcflags}"
+       OPTCFLAGS="%{rpmcflags}" \
+       LDFLAGS="%{rpmcflags} %{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 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 $RPM_BUILD_ROOT/sbin
-install hostapd_cli $RPM_BUILD_ROOT/sbin
-install nt_password_hash $RPM_BUILD_ROOT/sbin
-install hlr_auc_gw $RPM_BUILD_ROOT/sbin
+# hostapd hostapd_cli nt_password_hash hlr_auc_gw
+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.accept $RPM_BUILD_ROOT%{_sysconfdir}/hostap
-install hostapd.conf $RPM_BUILD_ROOT%{_sysconfdir}/hostap
-install hostapd.deny $RPM_BUILD_ROOT%{_sysconfdir}/hostap
+# hostapd configuration
+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
@@ -105,7 +103,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README
+%doc hostapd/ChangeLog hostapd/README
 %dir %{_sysconfdir}/hostap
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hostap/*
 %attr(755,root,root) /sbin/*