packages: wpa_supplicant/wpa_supplicant.config, wpa_supplicant/wpa_supplica...

[arekm]

Author: arekm                        Date: Mon Feb 22 08:49:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.7.1; drop dscape support (seems obsolete now; if not - correct me)

---- Files affected:
packages/wpa_supplicant:
   wpa_supplicant.config (1.7 -> 1.8) , wpa_supplicant.spec (1.67 -> 1.68) , wpa_supplicant-0.4.7_dscape-02.patch (1.3 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/wpa_supplicant/wpa_supplicant.config
diff -u packages/wpa_supplicant/wpa_supplicant.config:1.7 packages/wpa_supplicant/wpa_supplicant.config:1.8
--- packages/wpa_supplicant/wpa_supplicant.config:1.7	Fri Oct 31 17:12:45 2008
+++ packages/wpa_supplicant/wpa_supplicant.config	Mon Feb 22 09:49:39 2010
@@ -1,9 +1,6 @@
 # Driver interface for Host AP driver
 CONFIG_DRIVER_HOSTAP=y
 
-# Driver interface for Devicescape stack
-CONFIG_DRIVER_DSCAPE=y
-
 # Driver interface for Agere driver
 #CONFIG_DRIVER_HERMES=y
 # Change include directories to match with the local setup

================================================================
Index: packages/wpa_supplicant/wpa_supplicant.spec
diff -u packages/wpa_supplicant/wpa_supplicant.spec:1.67 packages/wpa_supplicant/wpa_supplicant.spec:1.68
--- packages/wpa_supplicant/wpa_supplicant.spec:1.67	Mon Mar 23 22:52:16 2009
+++ packages/wpa_supplicant/wpa_supplicant.spec	Mon Feb 22 09:49:39 2010
@@ -19,18 +19,17 @@
 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.9
+Version:	0.7.1
 Release:	1
 License:	GPL v2
 Group:		Networking
 Source0:	http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	0efb8fcedf0a8acf6f423dfdb0658fdd
+# Source0-md5:	02c475f949e5c131856915bbb87fa55d
 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
+Patch1:		%{name}-OPTCFLAGS.patch
 URL:		http://hostap.epitest.fi/wpa_supplicant/
 %{?with_dbus:BuildRequires:	dbus-devel}
 %{?with_madwifi:BuildRequires:	madwifi-devel}
@@ -106,7 +105,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 install %{SOURCE1} wpa_supplicant/.config
 
@@ -122,13 +120,13 @@
 %{__make} -C wpa_supplicant \
 	CC="%{__cc}" \
 	LDFLAGS="%{rpmldflags}" \
-	OPTCFLAGS="%{rpmcflags}"
+	OPTCFLAGS="%{rpmcppflags} %{rpmcflags}"
 
 # eapol_test:
 %{__make} -C wpa_supplicant eapol_test \
 	CC="%{__cc}" \
 	LDFLAGS="%{rpmldflags}" \
-	OPTCFLAGS="%{rpmcflags}"
+	OPTCFLAGS="%{rpmcppflags} %{rpmcflags}"
 
 %if %{with gui}
 cd wpa_supplicant/wpa_gui-qt4
@@ -140,7 +138,7 @@
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
 	LDFLAGS="%{rpmldflags}" \
-	OPTCFLAGS="%{rpmcflags}"
+	OPTCFLAGS="%{rpmcppflags} %{rpmcflags}"
 %endif
 
 %install
@@ -156,7 +154,7 @@
 
 %if %{with dbus}
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/dbus-1/system.d,%{_datadir}/dbus-1/system-services}
-install wpa_supplicant/dbus-wpa_supplicant.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
+install wpa_supplicant/dbus/dbus-wpa_supplicant.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
 install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
 %endif
 
@@ -197,6 +195,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2010/02/22 08:49:39  arekm
+- up to 0.7.1; drop dscape support (seems obsolete now; if not - correct me)
+
 Revision 1.67  2009/03/23 21:52:16  arvenil
 - up to 0.6.9
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpa_supplicant/wpa_supplicant.config?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpa_supplicant/wpa_supplicant.spec?r1=1.67&r2=1.68&f=u