Update to dbus-1.10.6

Note: from version 1.10 it's required to have systemd support to be enabled not
only in dbus-daemon code but also in libdbus.  This is because maintainers removed
built-in systemd support code (dbus/sd-daemon.c) and now depend on libsystemd-
provided functionality.

Additionally, update pkgconfig name to libsystemd (as required by configure.ac)

Change-Id: I2056086a9281543695643ac31fd3ab8648a4d205

diff --git a/packaging/dbus-x11.spec b/packaging/dbus-x11.spec
index a48add9..28f0710 100644 (file)
--- a/packaging/dbus-x11.spec
+++ b/packaging/dbus-x11.spec
@@ -27,7 +27,7 @@ BuildRequires:  xmlto
 BuildRequires:  pkgconfig(libsystemd-daemon)
 BuildRequires:  pkgconfig(libsystemd-login)
 %endif
-Version:        1.8.2
+Version:        1.10.6
 Release:        0
 Source0:        http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
 Source1:        rc.boot.dbus

diff --git a/packaging/dbus.spec b/packaging/dbus.spec
index 29fa2af..db2a044 100644 (file)
--- a/packaging/dbus.spec
+++ b/packaging/dbus.spec
@@ -20,12 +20,11 @@ BuildRequires:  libzio
 BuildRequires:  pkg-config
 BuildRequires:  xmlto
 %if %{with_systemd}
-BuildRequires:  pkgconfig(libsystemd-daemon)
-BuildRequires:  pkgconfig(libsystemd-login)
+BuildRequires:  pkgconfig(libsystemd)
 %endif
 BuildRequires:  pkgconfig(cynara-client-async)
 BuildRequires:  pkgconfig(cynara-session)
-Version:        1.8.2
+Version:        1.10.6
 Release:        0
 Source0:        http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
 Source1:        rc.boot.dbus
@@ -47,6 +46,8 @@ BuildRequires:  pkgconfig(cynara-client)
 # COMMON1-END
 Requires(pre):  /usr/sbin/groupadd /usr/sbin/useradd
 Provides:       dbus-1
+# This is an artificial requirement needed to keep proper order of building of the packages
+BuildRequires:  libdbus = %{version}
 
 
 
@@ -165,6 +166,8 @@ install -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/profile.d/dbus.sh
 %license  COPYING
 %config(noreplace) %{_sysconfdir}/dbus-1/session.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.conf
+%config(noreplace) %{_datadir}/dbus-1/session.conf
+%config(noreplace) %{_datadir}/dbus-1/system.conf
 %{_sysconfdir}/ConsoleKit
 %{_bindir}/dbus-cleanup-sockets
 %{_bindir}/dbus-daemon
@@ -172,6 +175,8 @@ install -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/profile.d/dbus.sh
 %{_bindir}/dbus-run-session
 %{_bindir}/dbus-send
 %{_bindir}/dbus-uuidgen
+%{_bindir}/dbus-test-tool
+%{_bindir}/dbus-update-activation-environment
 # See doc/system-activation.txt in source tarball for the rationale
 # behind these permissions
 %attr(4750,root,dbus) %verify(not mode) %{_libdir}/dbus/dbus-daemon-launch-helper
@@ -189,8 +194,8 @@ install -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/profile.d/dbus.sh
 %dir %{_unitdir}/sockets.target.wants
 %{_unitdir}/sockets.target.wants/dbus.socket
 %dir %{_sysconfdir}/dbus-1
-%dir %{_sysconfdir}/dbus-1/session.d
-%dir %{_sysconfdir}/dbus-1/system.d
+%dir %{_datadir}/dbus-1/session.d
+%dir %{_datadir}/dbus-1/system.d
 %dir %{_datadir}/dbus-1
 %dir %{_datadir}/dbus-1/interfaces
 %dir %{_datadir}/dbus-1/services
@@ -213,9 +218,14 @@ install -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/profile.d/dbus.sh
 %doc %{_datadir}/doc/dbus/dbus-test-plan.html
 %doc %{_datadir}/doc/dbus/dbus-tutorial.html
 %doc %{_datadir}/doc/dbus/dbus-uuidgen.1.html
+%doc %{_datadir}/doc/dbus/dbus-test-tool.1.html
+%doc %{_datadir}/doc/dbus/dbus-update-activation-environment.1.html
 %doc %{_datadir}/doc/dbus/dbus.devhelp
 %doc %{_datadir}/doc/dbus/diagram.*
 %doc %{_datadir}/doc/dbus/system-activation.txt
 %doc doc/*.txt doc/file-boilerplate.c doc/TODO
+%doc %{_datadir}/doc/dbus/examples/GetAllMatchRules.py
+%doc %{_datadir}/doc/dbus/examples/example-session-disable-stats.conf
+%doc %{_datadir}/doc/dbus/examples/example-system-enable-stats.conf
 
 %changelog

diff --git a/packaging/libdbus.spec b/packaging/libdbus.spec
index 975e47b..a11d596 100644 (file)
--- a/packaging/libdbus.spec
+++ b/packaging/libdbus.spec
@@ -1,12 +1,14 @@
 %bcond_with kdbus
 %bcond_with dbuspolicy
 
+%define with_systemd 1
+
 Name:           libdbus
 Url:            http://dbus.freedesktop.org/
 Summary:        Library package for D-Bus
 License:        GPL-2.0+ or AFL-2.1, LGPL-2.1+
 Group:          System/Libraries
-Version:        1.8.2
+Version:        1.10.6
 Release:        0
 Source0:        http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
 Source1001:     libdbus.manifest
@@ -15,6 +17,9 @@ BuildRequires:  expat-devel
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(libsmack)
+%if %{with_systemd}
+BuildRequires:  pkgconfig(libsystemd)
+%endif
 # Enable support for libdbuspolicy (only for kdbus transport)
 %if %{with kdbus}
 %if %{with dbuspolicy}
@@ -76,6 +81,9 @@ export V=1
     --with-init-scripts=suse                                           \
     --enable-inotify                                                   \
     --with-console-auth-dir=/var/run/dbus/at_console/                  \
+%if %{with_systemd}
+    --enable-systemd                                                   \
+%endif
     --with-systemdsystemunitdir=%{_unitdir}                            \
 %if %{with kdbus}
     --enable-kdbus-transport                                            \