Hello community,
here is the log from the commit of package dbus-1 for openSUSE:Factory checked
in at 2012-11-05 06:47:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old)
and /work/SRC/openSUSE:Factory/.dbus-1.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1", Maintainer is "thoe...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dbus-1/dbus-1-x11.changes 2012-10-26
17:44:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dbus-1.new/dbus-1-x11.changes 2012-11-05
06:47:14.000000000 +0100
@@ -1,0 +2,5 @@
+Sat Nov 3 16:33:15 UTC 2012 - crrodrig...@opensuse.org
+
+- Fix factory breakage on systemd units directory
+
+-------------------------------------------------------------------
dbus-1.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dbus-1-x11.spec ++++++
--- /var/tmp/diff_new_pack.xXc2rb/_old 2012-11-05 06:47:18.000000000 +0100
+++ /var/tmp/diff_new_pack.xXc2rb/_new 2012-11-05 06:47:18.000000000 +0100
@@ -30,6 +30,14 @@
# dbus-1 and systemd. Fun!
%define with_systemd 0
+%if ! %{with_systemd}
+%if 0%{?suse_version} < 1230
+%define _unitdir /lib/systemd/system
+%else
+%define _unitdir /usr/lib/systemd/system
+%endif
+%endif
+
BuildRequires: audit-devel
BuildRequires: doxygen
BuildRequires: libexpat-devel
@@ -110,7 +118,7 @@
%endif
--enable-libaudit \
--with-console-auth-dir=/var/run/dbus/at_console/ \
- --with-systemdsystemunitdir=/lib/systemd/system
+ --with-systemdsystemunitdir=%{_unitdir}
make %{?_smp_mflags}
doxygen -u && doxygen
./cleanup-man-pages.sh
++++++ dbus-1.spec ++++++
--- /var/tmp/diff_new_pack.xXc2rb/_old 2012-11-05 06:47:18.000000000 +0100
+++ /var/tmp/diff_new_pack.xXc2rb/_new 2012-11-05 06:47:18.000000000 +0100
@@ -29,6 +29,14 @@
# dbus-1 and systemd. Fun!
%define with_systemd 0
+%if ! %{with_systemd}
+%if 0%{?suse_version} < 1230
+%define _unitdir /lib/systemd/system
+%else
+%define _unitdir /usr/lib/systemd/system
+%endif
+%endif
+
BuildRequires: audit-devel
BuildRequires: doxygen
BuildRequires: libexpat-devel
@@ -161,7 +169,7 @@
%endif
--enable-libaudit \
--with-console-auth-dir=/var/run/dbus/at_console/ \
- --with-systemdsystemunitdir=/lib/systemd/system
+ --with-systemdsystemunitdir=%{_unitdir}
make %{?_smp_mflags}
doxygen -u && doxygen
./cleanup-man-pages.sh
@@ -249,16 +257,22 @@
%attr(4750,root,messagebus) %verify(not mode)
/lib/%{name}/dbus-daemon-launch-helper
%ghost %{_localstatedir}/run/dbus
%ghost %{_localstatedir}/lib/dbus/machine-id
+%if ! %{with_systemd}
+%if 0%{?suse_version} < 1230
%dir /lib/systemd
-%dir /lib/systemd/system
-/lib/systemd/system/dbus.service
-/lib/systemd/system/dbus.socket
-%dir /lib/systemd/system/dbus.target.wants
-/lib/systemd/system/dbus.target.wants/dbus.socket
-%dir /lib/systemd/system/multi-user.target.wants
-/lib/systemd/system/multi-user.target.wants/dbus.service
-%dir /lib/systemd/system/sockets.target.wants
-/lib/systemd/system/sockets.target.wants/dbus.socket
+%else
+%dir /usr/lib/systemd
+%dir %{_unitdir}
+%endif
+%endif
+%{_unitdir}/dbus.service
+%{_unitdir}/dbus.socket
+%dir %{_unitdir}/dbus.target.wants
+%{_unitdir}/dbus.target.wants/dbus.socket
+%dir %{_unitdir}/multi-user.target.wants
+%{_unitdir}/multi-user.target.wants/dbus.service
+%dir %{_unitdir}/sockets.target.wants
+%{_unitdir}/sockets.target.wants/dbus.socket
%files -n %{_libname}
%defattr(-, root, root)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
