- updated to 1.12.6

[packages/dbus.git] / dbus.spec

diff --git a/dbus.spec b/dbus.spec
index 66e8d98f597a3f04d9d4680dcb7ec6ce9a288459..7877cc08b25c6c02e3fa98b6b81a6f88aac46f5a 100644 (file)
--- a/dbus.spec
+++ b/dbus.spec
@@ -12,12 +12,12 @@
 Summary:       D-BUS message bus
 Summary(pl.UTF-8):     Magistrala przesyłania komunikatów D-BUS
 Name:          dbus
-Version:       1.10.12
+Version:       1.12.6
 Release:       1
-License:       AFL v2.1 or GPL v2
+License:       AFL v2.1 or GPL v2+
 Group:         Libraries
 Source0:       https://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
-# Source0-md5: bacef77336bbe588efa3124102d5fcdb
+# Source0-md5: 32a607e47b82ab11702355bf02502f20
 Source1:       messagebus.init
 Source2:       %{name}-daemon-1-profile.d-sh
 Source3:       %{name}-sysconfig
@@ -34,9 +34,9 @@ BuildRequires:        automake >= 1:1.13
 BuildRequires: docbook-dtd44-xml
 BuildRequires: doxygen
 BuildRequires: expat-devel >= %{expat_version}
-%{?with_apparmor:BuildRequires:        libapparmor-devel >= 1:2.8.95}
+%{?with_apparmor:BuildRequires:        libapparmor-devel >= 1:2.10}
 BuildRequires: libcap-ng-devel
-%{?with_selinux:BuildRequires: libselinux-devel}
+%{?with_selinux:BuildRequires: libselinux-devel >= 2.0.86}
 BuildRequires: libtool >= 2:2.0
 BuildRequires: libxslt-progs
 BuildRequires: pkgconfig
@@ -58,6 +58,8 @@ Requires(pre):        /usr/sbin/useradd
 Requires(post,preun,postun):   systemd-units >= 38
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      expat >= %{expat_version}
+%{?with_apparmor:Requires:     libapparmor >= 1:2.10}
+%{?with_selinux:Requires:      libselinux >= 2.0.86}
 Requires:      rc-scripts >= 0.4.3.0
 Requires:      systemd-units >= 38
 Provides:      group(messagebus)
@@ -202,6 +204,9 @@ ln -s dbus.service $RPM_BUILD_ROOT%{systemdunitdir}/messagebus.service
 # for local configuration in dbus 1.10+
 install -d $RPM_BUILD_ROOT/etc/dbus-1/{session.d,system.d}
 
+# we are creating messagebus user from rpm pre
+%{__rm} $RPM_BUILD_ROOT/usr/lib/sysusers.d/dbus.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -251,11 +256,12 @@ fi
 %attr(755,root,root) %{_bindir}/dbus-send
 %attr(755,root,root) %{_bindir}/dbus-test-tool
 %attr(755,root,root) %{_bindir}/dbus-update-activation-environment
-%attr(4754,root,messagebus) %{_libdir}/dbus-daemon-launch-helper
+%attr(4754,root,messagebus) %{_libexecdir}/dbus-daemon-launch-helper
 %dir %{_datadir}/dbus-1/services
 %dir %{_datadir}/dbus-1/system-services
 %{_datadir}/dbus-1/session.conf
 %{_datadir}/dbus-1/system.conf
+%{_datadir}/xml/dbus-1
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/session.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/messagebus
@@ -275,7 +281,6 @@ fi
 
 %{systemdunitdir}/dbus.service
 %{systemdunitdir}/dbus.socket
-%{systemdunitdir}/dbus.target.wants/dbus.socket
 %{systemdunitdir}/messagebus.service
 %{systemdunitdir}/multi-user.target.wants/dbus.service
 %{systemdunitdir}/sockets.target.wants/dbus.socket
@@ -306,6 +311,7 @@ fi
 %{_libdir}/libdbus-1.la
 %dir %{_libdir}/dbus-1.0
 %{_libdir}/dbus-1.0/include
+%{_libdir}/cmake/DBus1
 %{_includedir}/dbus-1.0
 %{_pkgconfigdir}/dbus-1.pc
 %dir %{_docdir}/dbus