packages: wpa_supplicant/wpa_supplicant.spec - enabled new dbus interface (...

[megabajt]

Author: megabajt                     Date: Sat Mar 12 21:20:39 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- enabled new dbus interface (for NM 0.9)
- removed -dbus.service (use dbus service files from tarball)
- added bss-changed-prop-notify.patch
- release 4

---- Files affected:
packages/wpa_supplicant:
   wpa_supplicant.spec (1.78 -> 1.79) 

---- Diffs:

================================================================
Index: packages/wpa_supplicant/wpa_supplicant.spec
diff -u packages/wpa_supplicant/wpa_supplicant.spec:1.78 packages/wpa_supplicant/wpa_supplicant.spec:1.79
--- packages/wpa_supplicant/wpa_supplicant.spec:1.78	Fri Mar 11 20:48:27 2011
+++ packages/wpa_supplicant/wpa_supplicant.spec	Sat Mar 12 22:20:33 2011
@@ -20,20 +20,21 @@
 Summary(pl.UTF-8):	Suplikant WPA/WPA2/RSN/IEEE 802.1X dla Linuksa
 Name:		wpa_supplicant
 Version:	0.7.3
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		Networking
 Source0:	http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
 # Source0-md5:	f516f191384a9a546e3f5145c08addda
 Source1:	%{name}.config
 Source2:	%{name}-wpa_gui.desktop
-Source3:	%{name}-dbus.service
 Patch0:		%{name}-makefile.patch
 Patch1:		%{name}-OPTCFLAGS.patch
 Patch2:		%{name}-lrelease.patch
 Patch3:		%{name}-syslog-support.patch
 # http://www.linuxwimax.org/Download
 Patch4:		%{name}-0.7.2-generate-libeap-peer.patch
+Patch5:		dbus-services.patch
+Patch6:		bss-changed-prop-notify.patch
 URL:		http://hostap.epitest.fi/wpa_supplicant/
 %{?with_dbus:BuildRequires:	dbus-devel}
 BuildRequires:	libnl-devel
@@ -137,6 +138,8 @@
 %patch2 -p0
 #patch3 -p0
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %{__sed} -i -e 's, at LIB@,%{_lib},' src/eap_peer/libeap0.pc
 
@@ -144,6 +147,8 @@
 
 %if %{with dbus}
 echo 'CONFIG_CTRL_IFACE_DBUS=y' >> wpa_supplicant/.config
+echo 'CONFIG_CTRL_IFACE_DBUS_NEW=y' >> wpa_supplicant/.config
+echo 'CONFIG_CTRL_IFACE_DBUS_INTRO=y' >> wpa_supplicant/.config
 %endif
 
 %if %{with madwifi}
@@ -197,7 +202,7 @@
 %if %{with dbus}
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/dbus-1/system.d,%{_datadir}/dbus-1/system-services}
 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
+install wpa_supplicant/dbus/*.service $RPM_BUILD_ROOT%{_datadir}/dbus-1/system-services
 %endif
 
 %if %{with gui}
@@ -229,6 +234,7 @@
 %if %{with dbus}
 %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
+%{_datadir}/dbus-1/system-services/fi.w1.wpa_supplicant1.service
 %endif
 
 %if %{with gui}
@@ -254,6 +260,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2011/03/12 21:20:33  megabajt
+- enabled new dbus interface (for NM 0.9)
+- removed -dbus.service (use dbus service files from tarball)
+- added bss-changed-prop-notify.patch
+- release 4
+
 Revision 1.78  2011/03/11 19:48:27  megabajt
 - fixed libeap installation path on x86_64
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wpa_supplicant/wpa_supplicant.spec?r1=1.78&r2=1.79&f=u