packaging: ensure ownership for /var/lib/dbus

For x86_64 builds, %{_localstatedir}%{_libdir}/dbus expands to
/var/usr/lib64/dbus, which is incorrect.

This commit fixes the path in the spec to make sure the intended
directory, /var/lib/dbus, is created and owned by this package.

Change-Id: I60947c4e2c221ad2f83d01bd87dc76fc8f5e4433

diff --git a/packaging/dbus.changes b/packaging/dbus.changes
index 6a2d1ce..55a29b6 100644 (file)
--- a/packaging/dbus.changes
+++ b/packaging/dbus.changes
@@ -1,3 +1,6 @@
+* Fri Jun 07 2013 Patrick McCarty <patrick.mccarty@linux.intel.com> a9964f4
+- packaging: ensure ownership for /var/lib/dbus
+
 * Sun May 26 2013 Anas Nashif <anas.nashif@intel.com> dbus-1.6.10@5e6b553
 - Update to 1.6.10
 

diff --git a/packaging/dbus.spec b/packaging/dbus.spec
index 8e63161..71bcb74 100644 (file)
--- a/packaging/dbus.spec
+++ b/packaging/dbus.spec
@@ -137,8 +137,8 @@ chmod a-x AUTHORS COPYING HACKING NEWS README doc/*.txt doc/file-boilerplate.c d
 #
 install -d %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
 install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
-mkdir -p %{buildroot}%{_localstatedir}%{_libdir}/dbus
-touch %{buildroot}/%{_localstatedir}%{_libdir}/dbus/machine-id
+mkdir -p %{buildroot}%{_localstatedir}/lib/dbus
+touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id
 
 mkdir -p %{buildroot}%{_unitdir_user}
 install -m0644 %{SOURCE5} %{buildroot}%{_unitdir_user}/dbus.service
@@ -159,7 +159,7 @@ install -m0644 %{SOURCE6} %{buildroot}%{_unitdir_user}/dbus.socket
 
 %files
 %defattr(-, root, root)
-%dir %{_localstatedir}%{_libdir}/dbus
+%dir %{_localstatedir}/lib/dbus
 %dir /lib/dbus-1
 %dir /lib/dbus-1/system-services
 %license  COPYING 
@@ -176,7 +176,7 @@ install -m0644 %{SOURCE6} %{buildroot}%{_unitdir_user}/dbus.socket
 # behind these permissions
 %attr(4750,root,dbus) %verify(not mode) %{_libdir}/dbus/dbus-daemon-launch-helper
 %ghost %{_localstatedir}/run/dbus
-%ghost %{_localstatedir}%{_libdir}/dbus/machine-id
+%ghost %{_localstatedir}/lib/dbus/machine-id
 %dir %{_unitdir}
 %{_unitdir}/dbus.service
 %{_unitdir}/dbus.socket