SPECS: dbus.spec - rel 3 - moved libraries to /lib (req. by /sbin/init from...

[baggins]

Author: baggins                      Date: Thu Nov 20 14:24:40 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3
- moved libraries to /lib (req. by /sbin/init from upstart)

---- Files affected:
SPECS:
   dbus.spec (1.178 -> 1.179) 

---- Diffs:

================================================================
Index: SPECS/dbus.spec
diff -u SPECS/dbus.spec:1.178 SPECS/dbus.spec:1.179
--- SPECS/dbus.spec:1.178	Wed Nov 12 22:06:05 2008
+++ SPECS/dbus.spec	Thu Nov 20 15:24:35 2008
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	Magistrala przesyłania komunikatów D-BUS
 Name:		dbus
 Version:	1.2.4
-Release:	2
+Release:	3
 License:	AFL v2.1 or GPL v2
 Group:		Libraries
 Source0:	http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
@@ -125,12 +125,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/profile.d
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -d $RPM_BUILD_ROOT/etc/sysconfig
-install -d $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d
+install -d $RPM_BUILD_ROOT/etc/{profile.d,rc.d/init.d,sysconfig,X11/xinit/xinitrc.d}
 install -d $RPM_BUILD_ROOT%{_datadir}/dbus-1/{services,interfaces}
 install -d $RPM_BUILD_ROOT%{_localstatedir}/run/dbus
+install -d $RPM_BUILD_ROOT/%{_lib}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -140,6 +138,11 @@
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/messagebus
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d
 
+# upstart (/sbin/init) requires libdbus so it must be in /lib(64)
+mv -f $RPM_BUILD_ROOT%{_libdir}/lib*.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/`(cd $RPM_BUILD_ROOT/%{_lib}; echo lib*.so.*.*)` \
+	$RPM_BUILD_ROOT%{_libdir}/libdbus*.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -215,8 +218,8 @@
 %files libs
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README doc/TODO
-%attr(755,root,root) %{_libdir}/libdbus-1.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdbus-1.so.3
+%attr(755,root,root) /%{_lib}/libdbus-1.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libdbus-1.so.3
 
 %files devel
 %defattr(644,root,root,755)
@@ -238,6 +241,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.179  2008/11/20 14:24:35  baggins
+- rel 3
+- moved libraries to /lib (req. by /sbin/init from upstart)
+
 Revision 1.178  2008/11/12 21:06:05  glen
 - rebuild for %groupadd; rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dbus.spec?r1=1.178&r2=1.179&f=u