[packages/dbus] - upstart is gone, we can move library back to libdir - rel 2
baggins
baggins at pld-linux.org
Tue Aug 18 16:37:38 CEST 2015
commit f926e709fa2704c52c680a3326b4bb8ea53549ca
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Aug 18 23:37:05 2015 +0900
- upstart is gone, we can move library back to libdir
- rel 2
dbus.spec | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/dbus.spec b/dbus.spec
index 2e0dc46..0320841 100644
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dbus.git/commitdiff/f926e709fa2704c52c680a3326b4bb8ea53549ca
More information about the pld-cvs-commit
mailing list