packages: dbus/dbus.spec, dbus/messagebus.init, dbus/messagebus.upstart (NE...
jajcus
jajcus at pld-linux.org
Tue May 11 18:58:26 CEST 2010
Author: jajcus Date: Tue May 11 16:58:26 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- upstart subpackage
- Release: 3
---- Files affected:
packages/dbus:
dbus.spec (1.200 -> 1.201) , messagebus.init (1.18 -> 1.19) , messagebus.upstart (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/dbus/dbus.spec
diff -u packages/dbus/dbus.spec:1.200 packages/dbus/dbus.spec:1.201
--- packages/dbus/dbus.spec:1.200 Mon May 10 17:45:08 2010
+++ packages/dbus/dbus.spec Tue May 11 18:58:20 2010
@@ -8,7 +8,7 @@
Summary(pl.UTF-8): Magistrala przesyłania komunikatów D-BUS
Name: dbus
Version: 1.2.24
-Release: 2
+Release: 3
License: AFL v2.1 or GPL v2
Group: Libraries
Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
@@ -17,6 +17,7 @@
Source2: %{name}-daemon-1-profile.d-sh
Source3: %{name}-sysconfig
Source4: %{name}-xinitrc.sh
+Source5: messagebus.upstart
Patch0: %{name}-nolibs.patch
Patch1: %{name}-config.patch
Patch2: %{name}-no_fatal_checks.patch
@@ -31,7 +32,7 @@
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: libtool
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.561
BuildRequires: sed >= 4.0
BuildRequires: xmlto
BuildRequires: xorg-lib-libX11-devel
@@ -66,6 +67,19 @@
używany zarówno jako ogólnosystemowa usługa magistrali komunikatów jak
i możliwość przesyłania komunikatów w ramach jednej sesji użytkownika.
+%package upstart
+Summary: Upstart job description for system message bus
+Summary(pl.UTF-8): Opis zadania Upstart dla magistrali systemowej DBus
+Group: Daemons
+Requires: %{name} = %{version}-%{release}
+Requires: upstart >= 0.6
+
+%description upstart
+Upstart job description for system message bus.
+
+%description upstart -l pl.UTF-8
+Opis zadania Upstart dla magistrali systemowej DBus.
+
%package dirs
Summary: D-BUS directories
Summary(pl.UTF-8): Katalogi D-BUS
@@ -140,7 +154,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{profile.d,rc.d/init.d,sysconfig,X11/xinit/xinitrc.d} \
+install -d $RPM_BUILD_ROOT/etc/{init,profile.d,rc.d/init.d,sysconfig,X11/xinit/xinitrc.d} \
$RPM_BUILD_ROOT%{_datadir}/dbus-1/{services,interfaces} \
$RPM_BUILD_ROOT%{_localstatedir}/run/dbus \
$RPM_BUILD_ROOT/%{_lib}
@@ -152,6 +166,7 @@
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
# 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}
@@ -181,6 +196,12 @@
%groupremove messagebus
fi
+%post upstart
+%upstart_post messagebus
+
+%postun upstart
+%upstart_postun messagebus
+
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@@ -227,6 +248,10 @@
%{_mandir}/man1/dbus-monitor.1*
%{_mandir}/man1/dbus-send.1*
+%files upstart
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/init/messagebus.conf
+
%files dirs
%defattr(644,root,root,755)
%dir %{_sysconfdir}/dbus-1
@@ -259,6 +284,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.201 2010/05/11 16:58:20 jajcus
+- upstart subpackage
+- Release: 3
+
Revision 1.200 2010/05/10 15:45:08 hawk
- release 2
================================================================
Index: packages/dbus/messagebus.init
diff -u packages/dbus/messagebus.init:1.18 packages/dbus/messagebus.init:1.19
--- packages/dbus/messagebus.init:1.18 Mon Mar 22 23:49:34 2010
+++ packages/dbus/messagebus.init Tue May 11 18:58:20 2010
@@ -32,6 +32,7 @@
return
fi
+ emit starting messagebus
msg_starting "D-BUS Message bus"
# if capability is modular, load it
if modinfo capability >/dev/null 2>&1; then
@@ -40,7 +41,10 @@
dbus-uuidgen --ensure
daemon --pidfile dbus.pid /usr/bin/dbus-daemon --system
RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/messagebus
+ if [ $RETVAL -eq 0 ] ; then
+ touch /var/lock/subsys/messagebus
+ emit --no-wait started messagebus
+ fi
}
stop() {
@@ -50,9 +54,11 @@
fi
# Stop daemons.
+ emit stopping messagebus
msg_stopping "D-BUS Message bus"
killproc --pidfile dbus.pid dbus-daemon
rm -f /var/lock/subsys/messagebus /var/run/dbus.pid
+ emit --no-wait stopped messagebus
}
condrestart() {
@@ -77,6 +83,8 @@
killproc --pidfile dbus.pid dbus-daemon -HUP
RETVAL=$?
}
+
+upstart_controlled
RETVAL=0
# See how we were called.
================================================================
Index: packages/dbus/messagebus.upstart
diff -u /dev/null packages/dbus/messagebus.upstart:1.1
--- /dev/null Tue May 11 18:58:26 2010
+++ packages/dbus/messagebus.upstart Tue May 11 18:58:20 2010
@@ -0,0 +1,16 @@
+description "The D-BUS systemwide message bus"
+
+start on started SERVICE=syslog-ng
+stop on pld.shutdown-started
+
+pre-start script
+ if modinfo capability >/dev/null 2>&1; then
+ modprobe -s capability
+ fi
+ dbus-uuidgen --ensure
+end script
+
+exec /usr/bin/dbus-daemon --system --fork
+expect fork
+
+# vi: ft=upstart
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dbus/dbus.spec?r1=1.200&r2=1.201&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dbus/messagebus.init?r1=1.18&r2=1.19&f=u
More information about the pld-cvs-commit
mailing list