Author: arekm Date: Thu Jun 26 21:54:14 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 0.6.3; switch gui to qt4 version
---- Files affected: SPECS: wpa_supplicant.spec (1.45 -> 1.46) ---- Diffs: ================================================================ Index: SPECS/wpa_supplicant.spec diff -u SPECS/wpa_supplicant.spec:1.45 SPECS/wpa_supplicant.spec:1.46 --- SPECS/wpa_supplicant.spec:1.45 Tue Apr 15 15:47:01 2008 +++ SPECS/wpa_supplicant.spec Thu Jun 26 23:54:08 2008 @@ -19,27 +19,27 @@ 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.6.1 -Release: 3 +Version: 0.6.3 +Release: 1 License: GPL v2 Group: Networking Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz -# Source0-md5: 99fe0c106803ab75356ebb93d20bd8c1 +# Source0-md5: b51b2975f21006f85f7297f3fb1acde1 Source1: %{name}.config Source2: %{name}-wpa_gui.desktop Source3: %{name}-dbus.service Patch0: %{name}-makefile.patch Patch1: %{name}-0.4.7_dscape-02.patch Patch2: %{name}-OPTCFLAGS.patch -Patch3: %{name}-dbus-permissions-fix.patch URL: http://hostap.epitest.fi/wpa_supplicant/ %{?with_dbus:BuildRequires: dbus-devel} %{?with_madwifi:BuildRequires: madwifi-devel} BuildRequires: ncurses-devel BuildRequires: openssl-devel %if %{with gui} -BuildRequires: qmake -BuildRequires: qt-devel +BuildRequires: QtGui-devel +BuildRequires: Qt3Support-devel +BuildRequires: qt4-build %endif BuildRequires: readline-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -104,9 +104,6 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%if %{with dbus} -%patch3 -p1 -%endif install %{SOURCE1} wpa_supplicant/.config @@ -125,9 +122,12 @@ OPTCFLAGS="%{rpmcflags}" %if %{with gui} -%{__make} -C wpa_supplicant wpa_gui \ - QTDIR=/usr \ - UIC=%{_bindir}/uic \ +cd wpa_supplicant/wpa_gui-qt4 +qmake-qt4 -o Makefile wpa_gui.pro +cd ../.. +%{__make} -C wpa_supplicant wpa_gui-qt4 \ + QTDIR=%{_libdir}/qt4 \ + UIC=%{_bindir}/uic-qt4 \ CC="%{__cc}" \ CXX="%{__cxx}" \ LDFLAGS="%{rpmldflags}" \ @@ -151,7 +151,7 @@ %endif %if %{with gui} -install wpa_supplicant/wpa_gui/wpa_gui $RPM_BUILD_ROOT%{_bindir} +install wpa_supplicant/wpa_gui-qt4/wpa_gui $RPM_BUILD_ROOT%{_bindir} install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/wpa_gui.desktop %endif @@ -184,7 +184,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.45 2008/04/15 13:47:01 glen +Revision 1.46 2008/06/26 21:54:08 arekm +- up to 0.6.3; switch gui to qt4 version + +Revision 1.45 2008-04-15 13:47:01 glen - include wpa_supplicant configs in %doc for reference; rel 3 Revision 1.44 2007-12-17 22:20:54 glen ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/wpa_supplicant.spec?r1=1.45&r2=1.46&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
