move dbus files from /usr/etc to /etc

dbus no longer looks for files in /usr/etc

Signed-off-by: Chris Leech <christopher.leech@linux.intel.com>

diff --git a/packaging/wpa_supplicant.changes b/packaging/wpa_supplicant.changes
index e8cf878..d900594 100644 (file)
--- a/packaging/wpa_supplicant.changes
+++ b/packaging/wpa_supplicant.changes
@@ -1,3 +1,6 @@
+* Fri Jun 15 2012 Chris Leech <christopher.leech@linux.intel.com> - 0.8.0
+- move dbus files from /usr/etc to /etc
+
 * Tue Jun 12 2012 Anas Nashif <anas.nashif@intel.com> e0f4a27
 - rename package name to be compatible with the world
 

diff --git a/packaging/wpa_supplicant.spec b/packaging/wpa_supplicant.spec
index 570073b..32edddd 100644 (file)
--- a/packaging/wpa_supplicant.spec
+++ b/packaging/wpa_supplicant.spec
@@ -37,8 +37,8 @@ cd wpa_supplicant
 %make_install
 
 # D-Bus
-mkdir -p %{buildroot}%{_prefix}/etc/dbus-1/system.d/
-cp dbus/dbus-wpa_supplicant.conf %{buildroot}%{_prefix}/etc/dbus-1/system.d/wpa_supplicant.conf
+mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d/
+cp dbus/dbus-wpa_supplicant.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/wpa_supplicant.conf
 mkdir -p %{buildroot}%{_datadir}/dbus-1/services/
 cp dbus/fi.epitest.hostap.WPASupplicant.service %{buildroot}%{_datadir}/dbus-1/services/
 cp dbus/fi.w1.wpa_supplicant1.service %{buildroot}%{_datadir}/dbus-1/services/
@@ -67,7 +67,7 @@ rm -rf %{buildroot}%{_sbindir}/wpa_passphrase
 %manifest wpasupplicant.manifest
 %{_sbindir}/wpa_cli
 %{_sbindir}/wpa_supplicant
-%attr(644,-,-) %{_prefix}/etc/dbus-1/system.d/*.conf
+%attr(644,-,-) %{_sysconfdir}/dbus-1/system.d/*.conf
 %attr(644,-,-) %{_datadir}/dbus-1/services/*.service
 %{_defaultdocdir}/wpasupplicant/README.wpa_supplicant.*
 %{_sysconfdir}/rc.d/init.d/wpa_supplicant