Hello community,
here is the log from the commit of package dbus-1 for openSUSE:Factory checked
in at 2015-09-24 06:13:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-06-01
09:33:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dbus-1.new/dbus-1-x11.changes 2015-09-24
06:13:27.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Sep 16 13:26:55 UTC 2015 - fst...@suse.com
+
+- Account for openSUSE:Leap in the conditional for chosing right
+ local state directories (boo#941352)
+
+-------------------------------------------------------------------
dbus-1.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dbus-1-x11.spec ++++++
--- /var/tmp/diff_new_pack.xcjOQ3/_old 2015-09-24 06:13:28.000000000 +0200
+++ /var/tmp/diff_new_pack.xcjOQ3/_new 2015-09-24 06:13:28.000000000 +0200
@@ -109,6 +109,7 @@
export LDFLAGS="-pie"
export CXXFLAGS="%{optflags} -fno-strict-aliasing"
export V=1
+# is_opensuse was first defined after openSUSE 13.2
%configure \
--disable-static \
--with-pic
\
@@ -125,7 +126,7 @@
%endif
--enable-systemd \
--enable-libaudit \
-%if 0%{?suse_version} <= 1315
+%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
--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
\
@@ -153,7 +154,7 @@
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
+%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
install -d %{buildroot}/var/run/dbus
%else
install -d %{buildroot}/run/dbus
@@ -189,7 +190,7 @@
%pre -n dbus-1
%{_sbindir}/groupadd -r messagebus 2> /dev/null || :
-%if 0%{?suse_version} <= 1315
+%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
%{_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 || :
@@ -244,7 +245,7 @@
# 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
+%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
%ghost /var/run/dbus
%else
%ghost /run/dbus
++++++ dbus-1.spec ++++++
--- /var/tmp/diff_new_pack.xcjOQ3/_old 2015-09-24 06:13:28.000000000 +0200
+++ /var/tmp/diff_new_pack.xcjOQ3/_new 2015-09-24 06:13:28.000000000 +0200
@@ -99,6 +99,7 @@
export LDFLAGS="-pie"
export CXXFLAGS="%{optflags} -fno-strict-aliasing"
export V=1
+# is_opensuse was first defined after openSUSE 13.2
%configure \
--disable-static \
--with-pic
\
@@ -115,7 +116,7 @@
%endif
--enable-systemd \
--enable-libaudit \
-%if 0%{?suse_version} <= 1315
+%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
--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
\
++++++ dbus-1-x11.spec.in ++++++
--- /var/tmp/diff_new_pack.xcjOQ3/_old 2015-09-24 06:13:28.000000000 +0200
+++ /var/tmp/diff_new_pack.xcjOQ3/_new 2015-09-24 06:13:28.000000000 +0200
@@ -83,7 +83,7 @@
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
+%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
install -d %{buildroot}/var/run/dbus
%else
install -d %{buildroot}/run/dbus
@@ -119,7 +119,7 @@
%pre -n dbus-1
%{_sbindir}/groupadd -r messagebus 2> /dev/null || :
-%if 0%{?suse_version} <= 1315
+%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
%{_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 || :
@@ -174,7 +174,7 @@
# 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
+%if 0%{?suse_version} <= 1315 && !0%{?is_opensuse}
%ghost /var/run/dbus
%else
%ghost /run/dbus
