From b166cd6ec4f755305481dfa1f0deb05abf936694 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Thu, 13 May 2010 19:38:13 +0000 Subject: [PATCH] - Remove prereq on chkconfig - Build GUI with qt4 for rawhide (rh #537105) --- wpa_supplicant-0.6.8-gui-qt4.patch | 12 ++++++++ wpa_supplicant.spec | 48 +++++++++++++++++++++++++++--- 2 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 wpa_supplicant-0.6.8-gui-qt4.patch diff --git a/wpa_supplicant-0.6.8-gui-qt4.patch b/wpa_supplicant-0.6.8-gui-qt4.patch new file mode 100644 index 0000000..c36969c --- /dev/null +++ b/wpa_supplicant-0.6.8-gui-qt4.patch @@ -0,0 +1,12 @@ +diff -up wpa_supplicant-0.6.8/wpa_supplicant/Makefile.qt4 wpa_supplicant-0.6.8/wpa_supplicant/Makefile +--- wpa_supplicant-0.6.8/wpa_supplicant/Makefile.qt4 2010-05-11 16:12:15.657510359 -0700 ++++ wpa_supplicant-0.6.8/wpa_supplicant/Makefile 2010-05-11 16:12:25.646383528 -0700 +@@ -1165,7 +1165,7 @@ wpa_gui: wpa_gui/Makefile + $(MAKE) -C wpa_gui + + wpa_gui-qt4/Makefile: +- qmake -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro ++ qmake-qt4 -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro + + wpa_gui-qt4: wpa_gui-qt4/Makefile + $(MAKE) -C wpa_gui-qt4 diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index 0f0422d..d5e62be 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -2,7 +2,7 @@ Summary: WPA/WPA2/IEEE 802.1X Supplicant Name: wpa_supplicant Epoch: 1 Version: 0.6.8 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Group: System Environment/Base Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz @@ -12,6 +12,18 @@ Source3: %{name}.init.d Source4: %{name}.sysconfig Source6: %{name}.logrotate +%define build_gui 1 +%if 0%{?rhel} >= 1 +%define build_gui 0 +%endif + +%if %{build_gui} +%define with_qt4 0 +%if 0%{?fedora} >= 14 +%define with_qt4 1 +%endif +%endif + Patch0: wpa_supplicant-assoc-timeout.patch Patch1: wpa_supplicant-0.5.7-qmake-location.patch Patch2: wpa_supplicant-0.5.7-flush-debug-output.patch @@ -25,17 +37,22 @@ Patch10: wpa_supplicant-0.6.8-scanning-property.patch Patch11: wpa_supplicant-0.6.9-scan-faster.patch Patch12: wpa_supplicant-0.6.9-eapol-race-fix.patch Patch13: wpa_supplicant-0.6.8-openssl-init.patch +Patch20: wpa_supplicant-0.6.8-gui-qt4.patch URL: http://w1.fi/wpa_supplicant/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%if %{build_gui} +%if %{with_qt4} +BuildRequires: qt-devel >= 4.0 +%else BuildRequires: qt3-devel +%endif +%endif BuildRequires: openssl-devel BuildRequires: readline-devel BuildRequires: dbus-devel -PreReq: chkconfig - %description wpa_supplicant is a WPA Supplicant for Linux, BSD and Windows with support for WPA and WPA2 (IEEE 802.11i / RSN). Supplicant is the IEEE 802.1X/WPA @@ -43,12 +60,16 @@ component that is used in the client stations. It implements key negotiation with a WPA Authenticator and it controls the roaming and IEEE 802.11 authentication/association of the wlan driver. +%if %{build_gui} + %package gui Summary: Graphical User Interface for %{name} Group: Applications/System %description gui -Graphical User Interface for wpa_supplicant written using QT3 +Graphical User Interface for wpa_supplicant written using QT + +%endif %prep %setup -q @@ -65,6 +86,7 @@ Graphical User Interface for wpa_supplicant written using QT3 %patch11 -p1 -b .scan-faster %patch12 -p1 -b .eapol-race-fix %patch13 -p1 -b .more-openssl-algs +%patch20 -p1 -b .qt4 %build pushd wpa_supplicant @@ -72,7 +94,13 @@ pushd wpa_supplicant CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; make %{_smp_mflags} +%if %{build_gui} +%if %{with_qt4} + QTDIR=%{_libdir}/qt4 make wpa_gui-qt4 %{_smp_mflags} +%else QTDIR=%{_libdir}/qt-3.3 make wpa_gui %{_smp_mflags} +%endif +%endif popd %install @@ -100,9 +128,15 @@ install -m 0644 %{name}/dbus-wpa_supplicant.conf %{buildroot}/%{_sysconfdir}/dbu install -d %{buildroot}/%{_datadir}/dbus-1/system-services/ install -m 0644 %{name}/dbus-wpa_supplicant.service %{buildroot}/%{_datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service +%if %{build_gui} # gui install -d %{buildroot}/%{_bindir} +%if %{with_qt4} +install -m 0755 %{name}/wpa_gui-qt4/wpa_gui %{buildroot}/%{_bindir} +%else install -m 0755 %{name}/wpa_gui/wpa_gui %{buildroot}/%{_bindir} +%endif +%endif # running mkdir -p %{buildroot}/%{_localstatedir}/run/%{name} @@ -150,11 +184,17 @@ fi %{_mandir}/man8/* %{_mandir}/man5/* +%if %{build_gui} %files gui %defattr(-, root, root) %{_bindir}/wpa_gui +%endif %changelog +* Thu May 13 2010 Dan Williams - 1:0.6.8-10 +- Remove prereq on chkconfig +- Build GUI with qt4 for rawhide (rh #537105) + * Thu May 6 2010 Dan Williams - 1:0.6.8-9 - Fix crash when interfaces are removed (like suspend/resume) (rh #589507)