SPECS: wpa_supplicant.spec - added bconded dbus control interface ...

[megabajt]

Author: megabajt                     Date: Wed Nov 21 17:25:23 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added bconded dbus control interface
- fix dbus interface permissions (dbus-permissions-fix.patch)
- release 2

---- Files affected:
SPECS:
   wpa_supplicant.spec (1.41 -> 1.42) 

---- Diffs:

================================================================
Index: SPECS/wpa_supplicant.spec
diff -u SPECS/wpa_supplicant.spec:1.41 SPECS/wpa_supplicant.spec:1.42
--- SPECS/wpa_supplicant.spec:1.41	Sat Jul 14 17:36:04 2007
+++ SPECS/wpa_supplicant.spec	Wed Nov 21 18:25:18 2007
@@ -7,8 +7,9 @@
 #	used instead of madwifi - so madwifi bcond will become obsolete soon /
 #
 # Conditional build
-%bcond_with	madwifi		# with madwifi support
+%bcond_without	dbus		# don't build D-BUS control interface
 %bcond_without	gui		# don't build gui
+%bcond_with	madwifi		# with madwifi support
 #
 # sync archlist with madwifi.spec
 %ifnarch %{x8664} arm %{ix86} mips ppc xscale
@@ -19,17 +20,20 @@
 Summary(pl.UTF-8):	Suplikant WPA/WPA2/RSN/IEEE 802.1X dla Linuksa
 Name:		wpa_supplicant
 Version:	0.6.0
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Networking
 Source0:	http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
 # Source0-md5:	635c7af7cecb39954997146b5c734b1c
 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
@@ -100,9 +104,16 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%if %{with dbus}
+%patch3 -p1
+%endif
 
 install %{SOURCE1} wpa_supplicant/.config
 
+%if %{with dbus}
+echo 'CONFIG_CTRL_IFACE_DBUS=y' >> wpa_supplicant/.config
+%endif
+
 %if %{with madwifi}
 echo 'CONFIG_DRIVER_MADWIFI=y' >> wpa_supplicant/.config
 %endif
@@ -133,6 +144,12 @@
 install wpa_supplicant/doc/docbook/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
 install wpa_supplicant/doc/docbook/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
+%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 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
+%endif
+
 %if %{with gui}
 install wpa_supplicant/wpa_gui/wpa_gui $RPM_BUILD_ROOT%{_bindir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/wpa_gui.desktop
@@ -148,6 +165,10 @@
 %attr(755,root,root) %{_sbindir}/*
 %attr(750,root,root) %dir /var/run/%{name}
 %{_mandir}/man[58]/*
+%if %{with dbus}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
+%{_datadir}/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service
+%endif
 
 %if %{with gui}
 %files -n wpa_gui
@@ -162,6 +183,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2007-11-21 17:25:18  megabajt
+- added bconded dbus control interface
+- fix dbus interface permissions (dbus-permissions-fix.patch)
+- release 2
+
 Revision 1.41  2007-07-14 15:36:04  arekm
 - up to 0.6.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/wpa_supplicant.spec?r1=1.41&r2=1.42&f=u