- upstart is gone, we can move library back to libdir

- rel 2

diff --git a/dbus.spec b/dbus.spec
index 2e0dc46b8ceecc1e715ba44d6e8c8b98f4eb6685..03208418bb4d778cd3657c898ef9398dcd2f73dc 100644 (file)
--- a/dbus.spec
+++ b/dbus.spec
@@ -8,7 +8,7 @@ Summary:        D-BUS message bus
 Summary(pl.UTF-8):     Magistrala przesyłania komunikatów D-BUS
 Name:          dbus
 Version:       1.8.20
-Release:       1
+Release:       2
 License:       AFL v2.1 or GPL v2
 Group:         Libraries
 Source0:       http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
@@ -184,11 +184,6 @@ install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d
 
 cp -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
-# upstart (/sbin/init) requires libdbus so it must be in /lib(64)
-mv -f $RPM_BUILD_ROOT%{_libdir}/libdbus-1.so.* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libdbus-1.so.*.*.*) \
-       $RPM_BUILD_ROOT%{_libdir}/libdbus-1.so
-
 ln -s dbus.service $RPM_BUILD_ROOT%{systemdunitdir}/messagebus.service
 
 %clean
@@ -265,8 +260,8 @@ fi
 %files libs
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README doc/TODO
-%attr(755,root,root) /%{_lib}/libdbus-1.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libdbus-1.so.3
+%attr(755,root,root) %{_libdir}/libdbus-1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdbus-1.so.3
 %dir /etc/dbus-1
 %dir /etc/dbus-1/system.d
 %dir /etc/dbus-1/session.d