Accepting request 849587 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849587
OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=298

dbus-1.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 16 08:50:11 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Fri Aug 21 22:09:46 UTC 2020 - Dan Čermák <dcermak@suse.com>
 

dbus-1.spec

@@ -148,6 +148,7 @@ done
 
 mkdir -p %{buildroot}%{_localstatedir}/lib/dbus
 
+%if !0%{?usrmerged}
 # Link the binaries that were in /bin back to /bin for compat (maybe remove for SLE-16)
 # Currently required to make upower work together with systemd
 mkdir -p %{buildroot}/bin
@@ -159,6 +160,7 @@ ln -sf /%{_bindir}/dbus-send %{buildroot}/bin/dbus-send
 ln -sf /%{_bindir}/dbus-test-tool %{buildroot}/bin/dbus-test-tool
 ln -sf /%{_bindir}/dbus-update-activation-environment %{buildroot}/bin/dbus-update-activation-environment
 ln -sf /%{_bindir}/dbus-uuidgen %{buildroot}/bin/dbus-uuidgen
+%endif
 
 mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 ln -s -f %{_sysconfdir}/alternatives/dbus-launch %{buildroot}%{_bindir}/dbus-launch
@@ -221,6 +223,7 @@ fi
 %{_bindir}/dbus-test-tool
 %{_bindir}/dbus-update-activation-environment
 %{_bindir}/dbus-uuidgen
+%if !0%{?usrmerged}
 /bin/dbus-cleanup-sockets
 /bin/dbus-daemon
 /bin/dbus-monitor
@@ -228,6 +231,7 @@ fi
 /bin/dbus-test-tool
 /bin/dbus-update-activation-environment
 /bin/dbus-uuidgen
+%endif
 %{_mandir}/man1/dbus-cleanup-sockets.1%{?ext_man}
 %{_mandir}/man1/dbus-daemon.1%{?ext_man}
 %{_mandir}/man1/dbus-monitor.1%{?ext_man}