- drop upstart, never used

- kill systemd infestation

diff --git a/dbus.spec b/dbus.spec
index 8a28dbb49b47aac2c68cd609a0fa29ae521933fc..49c5edf8fa4bafa4c1a082ac8aa0477c06a5fee3 100644 (file)
--- a/dbus.spec
+++ b/dbus.spec
@@ -17,8 +17,6 @@ Source1:      messagebus.init
 Source2:       %{name}-daemon-1-profile.d-sh
 Source3:       %{name}-sysconfig
 Source4:       %{name}-xinitrc.sh
-Source5:       messagebus.upstart
-Source6:       %{name}.tmpfiles
 Patch0:                %{name}-nolibs.patch
 Patch1:                %{name}-config.patch
 Patch2:                %{name}-no_fatal_checks.patch
@@ -37,7 +35,6 @@ BuildRequires:        libxslt-progs
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.626
 BuildRequires: sed >= 4.0
-BuildRequires: systemd-devel >= 32
 BuildRequires: xmlto
 %{?with_X11:BuildRequires:     xorg-lib-libX11-devel}
 Requires(post,postun): /sbin/ldconfig
@@ -48,11 +45,9 @@ Requires(pre):       /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
-Requires(post,preun,postun):   systemd-units >= 38
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      expat >= %{expat_version}
 Requires:      rc-scripts >= 0.4.3.0
-Requires:      systemd-units >= 38
 Provides:      group(messagebus)
 Provides:      user(messagebus)
 Obsoletes:     dbus-glib-tools
@@ -72,19 +67,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
@@ -172,7 +154,6 @@ D-BUS wraz z sesją X11 użytkownika.
        --with-console-auth-dir=%{_localstatedir}/run/console/ \
        --with-session-socket-dir=/tmp \
        --with-system-pid-file=%{_localstatedir}/run/dbus.pid \
-       --with-systemdsystemunitdir=%{systemdunitdir} \
        %{!?with_X11:--without-x}
 %{__make}
 
@@ -182,8 +163,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/{init,profile.d,rc.d/init.d,sysconfig,X
        $RPM_BUILD_ROOT%{_datadir}/dbus-1/{services,interfaces} \
        $RPM_BUILD_ROOT%{_localstatedir}/run/dbus \
        $RPM_BUILD_ROOT%{_localstatedir}/lib/dbus \
-       $RPM_BUILD_ROOT/%{_lib} \
-       $RPM_BUILD_ROOT%{systemdtmpfilesdir}
+       $RPM_BUILD_ROOT/%{_lib}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -192,17 +172,12 @@ 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
 
 # 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
 rm -rf $RPM_BUILD_ROOT
 
@@ -214,7 +189,6 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/chkconfig --add messagebus
 %service -n messagebus restart "D-Bus daemon"
 export NORESTART="yes"
-%systemd_post messagebus.service
 
 %preun
 if [ "$1" = "0" ];then
@@ -227,10 +201,8 @@ if [ "$1" = "0" ]; then
        %userremove messagebus
        %groupremove messagebus
 fi
-%systemd_reload
 
 %triggerpostun -- dbus < 1.4.16-5
-%systemd_trigger messagebus.service
 if [ -f /etc/sysconfig/dbus ]; then
        mv -f /etc/sysconfig/messagebus{,.rpmnew}
        mv -f /etc/sysconfig/{dbus,messagebus}
@@ -239,14 +211,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
 
@@ -265,7 +229,6 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/messagebus
 %attr(754,root,root) /etc/rc.d/init.d/messagebus
 %attr(755,root,root) /etc/profile.d/dbus-daemon-1.sh
-%{systemdtmpfilesdir}/%{name}.conf
 %dir %{_localstatedir}/lib/dbus
 %dir %{_localstatedir}/run/dbus
 %{_mandir}/man1/dbus-cleanup-sockets.1*
@@ -275,19 +238,6 @@ fi
 %{_mandir}/man1/dbus-run-session.1*
 %{_mandir}/man1/dbus-send.1*
 
-%{systemdunitdir}/dbus.service
-%{systemdunitdir}/dbus.socket
-%{systemdunitdir}/dbus.target.wants/dbus.socket
-%{systemdunitdir}/messagebus.service
-%{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/dbus.tmpfiles b/dbus.tmpfiles
deleted file mode 100644 (file)
index 38dd020..0000000
--- a/dbus.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/dbus 0755 root root -

diff --git a/messagebus.upstart b/messagebus.upstart
deleted file mode 100644 (file)
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