dbus.spec.diff

 % git diff
diff --git a/dbus.spec b/dbus.spec
index 331fac9..4b2e139 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -206,6 +206,14 @@ find %{buildroot} -name '*.la' -type f -delete
 rm -rf %{buildroot}%{_libdir}/cmake
 %endif
 
+# Delete upstream units
+rm -f %{buildroot}%{_unitdir}/dbus.{socket,service}
+rm -f %{buildroot}%{_unitdir}/sockets.target.wants/dbus.socket
+rm -f %{buildroot}%{_unitdir}/multi-user.target.wants/dbus.service
+rm -f %{buildroot}%{_userunitdir}/dbus.{socket,service}
+rm -f %{buildroot}%{_userunitdir}/sockets.target.wants/dbus.socket
+
+# Install downstream units
 install -Dp -m755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh
 install -Dp -m644 %{SOURCE2} %{buildroot}%{_unitdir}/dbus.socket
 install -Dp -m644 %{SOURCE3} %{buildroot}%{_unitdir}/dbus-daemon.service
@@ -217,20 +225,21 @@ ln -f -s dbus-daemon.service %{buildroot}%{_unitdir}/dbus.service
 ln -f -s dbus-daemon.service %{buildroot}%{_userunitdir}/dbus.service
 
 # D-Bus is unconditionally enabled on all systems
+ln -f -s ../dbus.service %{buildroot}%{_unitdir}/multi-user.target.wants/dbus.service
 ln -f -s ../dbus.socket %{buildroot}%{_unitdir}/sockets.target.wants/dbus.socket
 ln -f -s ../dbus.socket %{buildroot}%{_userunitdir}/sockets.target.wants/dbus.socket
 
+# Make sure that when somebody asks for D-Bus under the name of the
+# old SysV script, that he ends up with the standard dbus.service name
+# now.
+ln -s dbus.service %{buildroot}%{_unitdir}/messagebus.service
+
 # Obsolete, but still widely used, for drop-in configuration snippets.
 install --directory %{buildroot}%{_sysconfdir}/dbus-1/session.d
 install --directory %{buildroot}%{_sysconfdir}/dbus-1/system.d
 
 install --directory %{buildroot}%{_datadir}/dbus-1/interfaces
 
-# Make sure that when somebody asks for D-Bus under the name of the
-# old SysV script, that he ends up with the standard dbus.service name
-# now.
-ln -s dbus.service %{buildroot}%{_unitdir}/messagebus.service
-
 ## %find_lang %{gettext_package}
 
 install --directory %{buildroot}/var/lib/dbus