Hello community,
here is the log from the commit of package dbus-1 for openSUSE:Factory checked
in at 2020-11-25 19:27:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old)
and /work/SRC/openSUSE:Factory/.dbus-1.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1"
Wed Nov 25 19:27:20 2020 rev:164 rq:850346 version:1.12.20
Changes:
--------
dbus-1-x11.changes: same change
--- /work/SRC/openSUSE:Factory/dbus-1/dbus-1.changes 2020-08-28
23:44:54.983504166 +0200
+++ /work/SRC/openSUSE:Factory/.dbus-1.new.5913/dbus-1.changes 2020-11-25
19:27:21.986340723 +0100
@@ -1,0 +2,5 @@
+Fri Oct 16 08:50:11 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
dbus-1-x11.spec: same change
++++++ dbus-1.spec ++++++
--- /var/tmp/diff_new_pack.OLYo2c/_old 2020-11-25 19:27:22.786341708 +0100
+++ /var/tmp/diff_new_pack.OLYo2c/_new 2020-11-25 19:27:22.786341708 +0100
@@ -148,6 +148,7 @@
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-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 @@
%{_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 @@
/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}
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
