Author: glen Date: Sat Jul 30 13:42:33 2011 GMT Module: packages Tag: HEAD ---- Log message: - upstart: upstart_controlled early
---- Files affected: packages/dbus: dbus.spec (1.215 -> 1.216) , messagebus.init (1.20 -> 1.21) ---- Diffs: ================================================================ Index: packages/dbus/dbus.spec diff -u packages/dbus/dbus.spec:1.215 packages/dbus/dbus.spec:1.216 --- packages/dbus/dbus.spec:1.215 Tue Jun 7 12:54:58 2011 +++ packages/dbus/dbus.spec Sat Jul 30 15:42:28 2011 @@ -9,7 +9,7 @@ Summary(pl.UTF-8): Magistrala przesyłania komunikatów D-BUS Name: dbus Version: 1.4.10 -Release: 2 +Release: 3 License: AFL v2.1 or GPL v2 Group: Libraries Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz @@ -164,11 +164,11 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/messagebus -install %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/dbus-daemon-1.sh -install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/messagebus -install %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d -install %{SOURCE5} $RPM_BUILD_ROOT/etc/init/messagebus.conf +install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/messagebus +install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/dbus-daemon-1.sh +cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/messagebus +install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d +cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/init/messagebus.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} @@ -291,6 +291,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.216 2011/07/30 13:42:28 glen +- upstart: upstart_controlled early + Revision 1.215 2011/06/07 10:54:58 arekm - release 2 ================================================================ Index: packages/dbus/messagebus.init diff -u packages/dbus/messagebus.init:1.20 packages/dbus/messagebus.init:1.21 --- packages/dbus/messagebus.init:1.20 Fri May 21 13:01:20 2010 +++ packages/dbus/messagebus.init Sat Jul 30 15:42:28 2011 @@ -12,6 +12,8 @@ # Source function library . /etc/rc.d/init.d/functions +upstart_controlled + # Get network config . /etc/sysconfig/network @@ -83,8 +85,6 @@ killproc --pidfile dbus.pid dbus-daemon -HUP RETVAL=$? } - -upstart_controlled RETVAL=0 # See how we were called. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dbus/dbus.spec?r1=1.215&r2=1.216&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dbus/messagebus.init?r1=1.20&r2=1.21&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
