Author: arekm Date: Sat Jul 14 15:36:09 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.6.0
---- Files affected: SPECS: wpa_supplicant.spec (1.40 -> 1.41) ---- Diffs: ================================================================ Index: SPECS/wpa_supplicant.spec diff -u SPECS/wpa_supplicant.spec:1.40 SPECS/wpa_supplicant.spec:1.41 --- SPECS/wpa_supplicant.spec:1.40 Sun Jun 3 19:23:46 2007 +++ SPECS/wpa_supplicant.spec Sat Jul 14 17:36:04 2007 @@ -18,12 +18,12 @@ Summary: Linux WPA/WPA2/RSN/IEEE 802.1X supplicant Summary(pl.UTF-8): Suplikant WPA/WPA2/RSN/IEEE 802.1X dla Linuksa Name: wpa_supplicant -Version: 0.5.8 +Version: 0.6.0 Release: 1 License: GPL v2 Group: Networking Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz -# Source0-md5: 7bb22f2bcdeed54b3fb5407d6d8bc9bb +# Source0-md5: 635c7af7cecb39954997146b5c734b1c Source1: %{name}.config Source2: %{name}-wpa_gui.desktop Patch0: %{name}-makefile.patch @@ -101,20 +101,20 @@ %patch1 -p1 %patch2 -p1 -install %{SOURCE1} .config +install %{SOURCE1} wpa_supplicant/.config %if %{with madwifi} -echo 'CONFIG_DRIVER_MADWIFI=y' >> .config +echo 'CONFIG_DRIVER_MADWIFI=y' >> wpa_supplicant/.config %endif %build -%{__make} \ +%{__make} -C wpa_supplicant \ CC="%{__cc}" \ LDFLAGS="%{rpmldflags}" \ OPTCFLAGS="%{rpmcflags}" %if %{with gui} -%{__make} wpa_gui \ +%{__make} -C wpa_supplicant wpa_gui \ QTDIR=/usr \ UIC=%{_bindir}/uic \ CC="%{__cc}" \ @@ -126,14 +126,15 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_mandir}/man{5,8},%{_bindir},%{_desktopdir},/var/run/%{name}} -%{__make} install \ + +%{__make} -C wpa_supplicant install \ DESTDIR=$RPM_BUILD_ROOT -install doc/docbook/*.5 $RPM_BUILD_ROOT%{_mandir}/man5 -install doc/docbook/*.8 $RPM_BUILD_ROOT%{_mandir}/man8 +install wpa_supplicant/doc/docbook/*.5 $RPM_BUILD_ROOT%{_mandir}/man5 +install wpa_supplicant/doc/docbook/*.8 $RPM_BUILD_ROOT%{_mandir}/man8 %if %{with gui} -install wpa_gui/wpa_gui $RPM_BUILD_ROOT%{_bindir} +install wpa_supplicant/wpa_gui/wpa_gui $RPM_BUILD_ROOT%{_bindir} install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/wpa_gui.desktop %endif @@ -142,7 +143,7 @@ %files %defattr(644,root,root,755) -%doc ChangeLog README eap_testing.txt todo.txt +%doc wpa_supplicant/{ChangeLog,README,eap_testing.txt,todo.txt} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf %attr(755,root,root) %{_sbindir}/* %attr(750,root,root) %dir /var/run/%{name} @@ -161,6 +162,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.41 2007/07/14 15:36:04 arekm +- up to 0.6.0 + Revision 1.40 2007/06/03 17:23:46 areq - 0.5.8 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/wpa_supplicant.spec?r1=1.40&r2=1.41&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
