commit 63456e69d732de3495f682bac8cf75b8236c90d5
Author: Jacek Konieczny <[email protected]>
Date: Thu Apr 23 08:55:30 2015 +0200
remove all Upstart hacks
Release: 3
dbus.spec | 37 ++++---------------------------------
messagebus.upstart | 28 ----------------------------
2 files changed, 4 insertions(+), 61 deletions(-)
---
diff --git a/dbus.spec b/dbus.spec
index bc4b6d7..27c935f 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.16
-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,8 +17,7 @@ Source1: messagebus.init
Source2: %{name}-daemon-1-profile.d-sh
Source3: %{name}-sysconfig
Source4: %{name}-xinitrc.sh
-Source5: messagebus.upstart
-Source6: %{name}.tmpfiles
+Source5: %{name}.tmpfiles
Patch0: %{name}-nolibs.patch
Patch1: %{name}-config.patch
Patch2: %{name}-no_fatal_checks.patch
@@ -72,19 +71,6 @@ D-BUS to system przesyłania komunikatów pomiędzy
aplikacjami. Jest
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 libs
Summary: D-BUS library
Summary(pl.UTF-8): Biblioteka D-BUS
@@ -178,7 +164,7 @@ D-BUS wraz z sesją X11 użytkownika.
%install
rm -rf $RPM_BUILD_ROOT
-install -d
$RPM_BUILD_ROOT%{_sysconfdir}/{init,profile.d,rc.d/init.d,sysconfig,X11/xinit/xinitrc.d}
\
+install -d
$RPM_BUILD_ROOT%{_sysconfdir}/{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%{_localstatedir}/lib/dbus \
@@ -192,9 +178,8 @@ 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
-cp -p %{SOURCE6} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+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}
@@ -239,14 +224,6 @@ elif [ -f /etc/sysconfig/dbus.rpmsave ]; then
mv -f /etc/sysconfig/{dbus.rpmsave,messagebus}
fi
-%if 0
-%post upstart
-%upstart_post messagebus
-
-%postun upstart
-%upstart_postun messagebus
-%endif
-
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@@ -282,12 +259,6 @@ fi
%{systemdunitdir}/multi-user.target.wants/dbus.service
%{systemdunitdir}/sockets.target.wants/dbus.socket
-%if "%{pld_release}" != "ti"
-%files upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/messagebus.conf
-%endif
-
%files libs
%defattr(644,root,root,755)
%doc AUTHORS COPYING ChangeLog NEWS README doc/TODO
diff --git a/messagebus.upstart b/messagebus.upstart
deleted file mode 100644
index e8e6616..0000000
--- a/messagebus.upstart
+++ /dev/null
@@ -1,28 +0,0 @@
-# dbus - D-Bus system message bus
-#
-# The D-Bus system message bus allows system daemons and user applications
-# to communicate.
-
-description "D-Bus system message bus"
-
-start on pld.sysinit-done
-stop on pld.shutdown-started
-
-expect fork
-respawn
-
-pre-start script
- if modinfo capability >/dev/null 2>&1; then
- modprobe -s capability
- fi
- exec dbus-uuidgen --ensure
-end script
-
-exec /usr/bin/dbus-daemon --system --fork
-
-# ask Upstart to reconnect to the bus
-post-start exec kill -USR1 1
-
-post-stop script
- rm -f /var/run/dbus.pid || :
-end script
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dbus.git/commitdiff/63456e69d732de3495f682bac8cf75b8236c90d5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
