SPECS: wpa_supplicant.spec - enable building of wpa_gui; reverse m...

[blues]

Author: blues                        Date: Fri Dec 16 21:44:02 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- enable building of wpa_gui; reverse madwifi bcond, should be enabled when
  madwifi will be on ftp...

---- Files affected:
SPECS:
   wpa_supplicant.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/wpa_supplicant.spec
diff -u SPECS/wpa_supplicant.spec:1.15 SPECS/wpa_supplicant.spec:1.16
--- SPECS/wpa_supplicant.spec:1.15	Tue Nov 22 16:07:57 2005
+++ SPECS/wpa_supplicant.spec	Fri Dec 16 22:43:56 2005
@@ -1,7 +1,12 @@
 # $Revision$, $Date$
+# TODO:
+# - wpa_gui can be build with qt4 - bcond?
+# - tls extension is in sources - maybe to use it?
+# - icon and desktop for wpa_gui
 #
 # Conditional build
-%bcond_without	madwifi		# without madwifi support
+%bcond_with	madwifi		# with madwifi support (enable it by default
+				# if madwifi will be on ftp...)
 #
 # sync archlist with madwifi.spec
 %ifnarch %{x8664} arm %{ix86} mips ppc xscale
@@ -12,7 +17,7 @@
 Summary(pl):	Suplikant WPA/WPA2/RSN/IEEE 802.1X dla Linuksa
 Name:		wpa_supplicant
 Version:	0.4.7
-Release:	1
+Release:	1.1
 License:	GPL v2
 Group:		Networking 
 Source0:	http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -23,6 +28,7 @@
 %{?with_madwifi:BuildRequires:	madwifi-devel}
 BuildRequires:	ncurses-devel
 BuildRequires:	openssl-devel
+BuildRequires:	qmake
 BuildRequires:	readline-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -69,6 +75,15 @@
 - zarządzanie kluczy dla CCMP, TKIP, WEP104, WEP40
 - RSN/WPA2 (IEEE 802.11i)
 
+%package -n wpa_gui
+Summary:	Linux WPA/WPA2/RSN/IEEE 802.1X supplicant GUI
+Summary(pl):	Graficzny interfejs suplikanta WPA/WPA2/RSN/IEEE 802.1X dla Linuksa
+Group:		X11/Applications/Networking
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description -n wpa_gui
+Linux WPA/WPA2/RSN/IEEE 802.1X supplicant GUI
+
 %prep
 %setup -q
 %patch0 -p1
@@ -85,9 +100,15 @@
 	CC="%{__cc}" \
 	OPT="%{rpmcflags}"
 
+%{__make} wpa_gui \
+	QTDIR=/usr \
+	UIC=%{_bindir}/uic \
+	CC="%{__cc}" \
+	OPT="%{rpmcflags}"
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_mandir}/man{5,8}
+install -d $RPM_BUILD_ROOT{%{_mandir}/man{5,8},%{_bindir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -95,6 +116,8 @@
 install doc/docbook/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
 install doc/docbook/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
+install wpa_gui/wpa_gui $RPM_BUILD_ROOT%{_bindir} 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -105,12 +128,20 @@
 %attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man[58]/*
 
+%files -n wpa_gui
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/wpa_gui
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2005/12/16 21:43:56  blues
+- enable building of wpa_gui; reverse madwifi bcond, should be enabled when
+  madwifi will be on ftp...
+
 Revision 1.15  2005/11/22 15:07:57  domelu
 - up to 0.4.7, madwifi works
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/wpa_supplicant.spec?r1=1.15&r2=1.16&f=u