Hello community, here is the log from the commit of package dbus-1 for openSUSE:Factory checked in at 2015-03-29 20:16:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old) and /work/SRC/openSUSE:Factory/.dbus-1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1" Changes: -------- --- /work/SRC/openSUSE:Factory/dbus-1/dbus-1-x11.changes 2015-02-12 10:22:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dbus-1.new/dbus-1-x11.changes 2015-03-29 20:16:59.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Mar 26 11:04:22 UTC 2015 - [email protected] + +- Sync changes from SLE12 conditionalized for suse_version <= 1315 + +------------------------------------------------------------------- dbus-1.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-x11.spec ++++++ --- /var/tmp/diff_new_pack.E2J4Sq/_old 2015-03-29 20:17:00.000000000 +0200 +++ /var/tmp/diff_new_pack.E2J4Sq/_new 2015-03-29 20:17:00.000000000 +0200 @@ -134,9 +134,15 @@ --enable-systemd \ %endif --enable-libaudit \ +%if 0%{?suse_version} <= 1315 + --with-console-auth-dir=/var/run/dbus/at_console/ \ + --with-system-pid-file=/var/run/dbus/pid \ + --with-system-socket=/var/run/dbus/system_bus_socket \ +%else --with-console-auth-dir=/run/dbus/at_console/ \ --with-system-pid-file=/run/dbus/pid \ --with-system-socket=/run/dbus/system_bus_socket \ +%endif --with-systemdsystemunitdir=%{_unitdir} make %{?_smp_mflags} @@ -156,7 +162,11 @@ mv %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir} mv %{buildroot}/bin/dbus-run-session %{buildroot}/%{_bindir} ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcdbus +%if 0%{?suse_version} <= 1315 +install -d %{buildroot}/var/run/dbus +%else install -d %{buildroot}/run/dbus +%endif mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/ install -m 0644 %{SOURCE2} \ %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop @@ -188,7 +198,11 @@ %pre -n dbus-1 %{_sbindir}/groupadd -r messagebus 2> /dev/null || : +%if 0%{?suse_version} <= 1315 +%{_sbindir}/useradd -r -s /bin/false -c "User for D-Bus" -d /var/run/dbus -g messagebus messagebus 2> /dev/null || : +%else %{_sbindir}/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g messagebus messagebus 2> /dev/null || : +%endif %post -n dbus-1 if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id ]; then @@ -239,7 +253,11 @@ # See doc/system-activation.txt in source tarball for the rationale # behind these permissions %attr(4750,root,messagebus) %verify(not mode) /lib/dbus-1/dbus-daemon-launch-helper +%if 0%{?suse_version} <= 1315 +%ghost /var/run/dbus +%else %ghost /run/dbus +%endif %ghost %{_localstatedir}/lib/dbus/machine-id %if ! %{with_systemd} %dir %{_libexecdir}/systemd ++++++ dbus-1.spec ++++++ --- /var/tmp/diff_new_pack.E2J4Sq/_old 2015-03-29 20:17:00.000000000 +0200 +++ /var/tmp/diff_new_pack.E2J4Sq/_new 2015-03-29 20:17:00.000000000 +0200 @@ -122,9 +122,15 @@ --enable-systemd \ %endif --enable-libaudit \ +%if 0%{?suse_version} <= 1315 + --with-console-auth-dir=/var/run/dbus/at_console/ \ + --with-system-pid-file=/var/run/dbus/pid \ + --with-system-socket=/var/run/dbus/system_bus_socket \ +%else --with-console-auth-dir=/run/dbus/at_console/ \ --with-system-pid-file=/run/dbus/pid \ --with-system-socket=/run/dbus/system_bus_socket \ +%endif --with-systemdsystemunitdir=%{_unitdir} make %{?_smp_mflags} -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
