SPECS (DEVEL): wpa_supplicant.spec - err, changes from HEAD

[glen]

Author: glen                         Date: Fri Aug 29 16:39:32 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- err, changes from HEAD

---- Files affected:
SPECS:
   wpa_supplicant.spec (1.47.2.1 -> 1.47.2.2) 

---- Diffs:

================================================================
Index: SPECS/wpa_supplicant.spec
diff -u SPECS/wpa_supplicant.spec:1.47.2.1 SPECS/wpa_supplicant.spec:1.47.2.2
--- SPECS/wpa_supplicant.spec:1.47.2.1	Fri Aug 29 18:23:46 2008
+++ SPECS/wpa_supplicant.spec	Fri Aug 29 18:39:26 2008
@@ -3,7 +3,7 @@
 # - wpa_gui can be built with qt4 - bcond?
 # - icon for wpa_gui
 # - reverse madwifi bcond when appropriate packages will be available on ftp
-#	/ as of madwifi-ng > r1499 and kernel > 2.6.14 wext driver could be 
+#	/ as of madwifi-ng > r1499 and kernel > 2.6.14 wext driver could be
 #	used instead of madwifi - so madwifi bcond will become obsolete soon /
 #
 # Conditional build
@@ -37,9 +37,10 @@
 BuildRequires:	ncurses-devel
 BuildRequires:	openssl-devel
 %if %{with gui}
-BuildRequires:	QtGui-devel
 BuildRequires:	Qt3Support-devel
+BuildRequires:	QtGui-devel
 BuildRequires:	qt4-build
+BuildRequires:	qt4-qmake
 %endif
 BuildRequires:	readline-devel
 Requires:	rc-scripts >= 0.4.1.24
@@ -126,7 +127,7 @@
 cd wpa_supplicant/wpa_gui-qt4
 qmake-qt4 -o Makefile wpa_gui.pro
 cd ../..
-%{__make} -C wpa_supplicant wpa_gui-qt4 \
+%{__make} -j1 -C wpa_supplicant wpa_gui-qt4 \
 	QTDIR=%{_libdir}/qt4 \
 	UIC=%{_bindir}/uic-qt4 \
 	CC="%{__cc}" \
@@ -152,7 +153,6 @@
 %endif
 
 %if %{with gui}
-ls -l wpa_supplicant/wpa_gui*
 install wpa_supplicant/wpa_gui-qt4/wpa_gui $RPM_BUILD_ROOT%{_bindir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/wpa_gui.desktop
 %endif
@@ -169,7 +169,7 @@
 %attr(750,root,root) %dir /var/run/%{name}
 %{_mandir}/man[58]/*
 %if %{with dbus}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/wpa_supplicant.conf
 %{_datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
 %endif
 
@@ -186,6 +186,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47.2.2  2008/08/29 16:39:26  glen
+- err, changes from HEAD
+
 Revision 1.47.2.1  2008/08/29 16:23:46  glen
 - debug why only on th i686 it builds
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/wpa_supplicant.spec?r1=1.47.2.1&r2=1.47.2.2&f=u