From 12c49c511191af332c104ed037d331cad06f961a Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 17 Feb 2017 08:17:08 +0000 Subject: [PATCH 1/6] Update to 1.11.10 --- .gitignore | 1 + dbus.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 27aa1dd..9fbbd7c 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /dbus-1.11.4.tar.gz /dbus-1.11.6.tar.gz /dbus-1.11.8.tar.gz +/dbus-1.11.10.tar.gz diff --git a/dbus.spec b/dbus.spec index cfe525a..9888530 100644 --- a/dbus.spec +++ b/dbus.spec @@ -17,7 +17,7 @@ Name: dbus Epoch: 1 -Version: 1.11.8 +Version: 1.11.10 Release: 1%{?dist} Summary: D-BUS message bus @@ -315,6 +315,7 @@ popd %{_userunitdir}/dbus.service %{_userunitdir}/dbus.socket %{_userunitdir}/sockets.target.wants/dbus.socket +%{_sysusersdir}/dbus.conf %files libs %{!?_licensedir:%global license %%doc} @@ -350,6 +351,9 @@ popd %changelog +* Fri Feb 17 2017 David King - 1:1.11.10-1 +- Update to 1.11.10 + * Tue Nov 29 2016 David King - 1:1.11.8-1 - Update to 1.11.8 diff --git a/sources b/sources index 4a03e82..63188c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4c21f9a536fce4a544761949ec8b456 dbus-1.11.8.tar.gz +SHA512 (dbus-1.11.10.tar.gz) = 1a2cf0f19676aaf70a024d04808615068e0e99d5bfa26ba82e491e53ae9722b81fe2edb38ec5c6802f027c7a5f3a0765d4368b9e4678bc2930b229efde1b17ce From 8fa1e421c2b397471b33b959e08561bbb2b094e3 Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 2 Mar 2017 09:43:25 +0000 Subject: [PATCH 2/6] Own session.d and system.d directories (#1285033) --- dbus.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dbus.spec b/dbus.spec index 9888530..a76139b 100644 --- a/dbus.spec +++ b/dbus.spec @@ -18,7 +18,7 @@ Name: dbus Epoch: 1 Version: 1.11.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: D-BUS message bus Group: System Environment/Libraries @@ -162,7 +162,11 @@ find %{buildroot} -name '*.la' -type f -delete install -Dp -m755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh -mkdir -p %{buildroot}%{_datadir}/dbus-1/interfaces +# Obsolete, but still widely used, for drop-in configuration snippets. +install --directory %{buildroot}%{_sysconfdir}/dbus-1/session.d +install --directory %{buildroot}%{_sysconfdir}/dbus-1/system.d + +install --directory %{buildroot}%{_datadir}/dbus-1/interfaces # Make sure that when somebody asks for D-Bus under the name of the # old SysV script, that he ends up with the standard dbus.service name @@ -173,13 +177,13 @@ ln -s dbus.service %{buildroot}%{_unitdir}/messagebus.service # Delete the old legacy sysv init script rm -rf %{buildroot}%{_initrddir} -mkdir -p %{buildroot}/var/lib/dbus +install --directory %{buildroot}/var/lib/dbus install -pm 644 -t %{buildroot}%{_pkgdocdir} \ doc/introspect.dtd doc/introspect.xsl doc/system-activation.txt # Make sure that the documentation shows up in Devhelp. -mkdir -p %{buildroot}%{_datadir}/gtk-doc/html +install --directory %{buildroot}%{_datadir}/gtk-doc/html ln -s %{_pkgdocdir} %{buildroot}%{_datadir}/gtk-doc/html/dbus # Shell wrapper for installed tests, modified from Debian package. @@ -276,6 +280,8 @@ popd %exclude %{_pkgdocdir}/system-activation.txt %exclude %{_pkgdocdir}/*.html %dir %{_sysconfdir}/dbus-1 +%dir %{_sysconfdir}/dbus-1/session.d +%dir %{_sysconfdir}/dbus-1/system.d %config %{_sysconfdir}/dbus-1/session.conf %config %{_sysconfdir}/dbus-1/system.conf %ghost %dir /run/%{name} @@ -351,6 +357,9 @@ popd %changelog +* Thu Mar 02 2017 David King - 1:1.11.10-2 +- Own session.d and system.d directories (#1285033) + * Fri Feb 17 2017 David King - 1:1.11.10-1 - Update to 1.11.10 From 4479fa40554305fa65677055b1750968f2a04bab Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 7 Apr 2017 20:15:13 +0100 Subject: [PATCH 3/6] Update to 1.11.12 --- .gitignore | 1 + dbus.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9fbbd7c..27a7de5 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /dbus-1.11.6.tar.gz /dbus-1.11.8.tar.gz /dbus-1.11.10.tar.gz +/dbus-1.11.12.tar.gz diff --git a/dbus.spec b/dbus.spec index a76139b..b79d27e 100644 --- a/dbus.spec +++ b/dbus.spec @@ -17,8 +17,8 @@ Name: dbus Epoch: 1 -Version: 1.11.10 -Release: 2%{?dist} +Version: 1.11.12 +Release: 1%{?dist} Summary: D-BUS message bus Group: System Environment/Libraries @@ -351,12 +351,16 @@ popd %{_datadir}/xml/dbus-1 %{_libdir}/lib*.so %dir %{_libdir}/dbus-1.0 +%{_libdir}/cmake/DBus1 %{_libdir}/dbus-1.0/include/ %{_libdir}/pkgconfig/dbus-1.pc %{_includedir}/* %changelog +* Fri Apr 07 2017 David King - 1:1.11.12-1 +- Update to 1.11.12 + * Thu Mar 02 2017 David King - 1:1.11.10-2 - Own session.d and system.d directories (#1285033) diff --git a/sources b/sources index 63188c8..b10fefe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dbus-1.11.10.tar.gz) = 1a2cf0f19676aaf70a024d04808615068e0e99d5bfa26ba82e491e53ae9722b81fe2edb38ec5c6802f027c7a5f3a0765d4368b9e4678bc2930b229efde1b17ce +SHA512 (dbus-1.11.12.tar.gz) = 9d96e396b3b0e8b69cec78c3f124b0f6ba7ddbc257c5615cf874704a3359459a315ed9a74fdd3f635b4e711b42fe5ad01ce687bfecf6875e30b1ba4f14d0c4aa From 34fded57862808353c1184731d396a7f8e5722a2 Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 29 Jun 2017 22:54:00 +0100 Subject: [PATCH 4/6] Update to 1.11.14 --- .gitignore | 1 + dbus.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 27a7de5..619128a 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /dbus-1.11.8.tar.gz /dbus-1.11.10.tar.gz /dbus-1.11.12.tar.gz +/dbus-1.11.14.tar.gz diff --git a/dbus.spec b/dbus.spec index b79d27e..6f8a7cc 100644 --- a/dbus.spec +++ b/dbus.spec @@ -3,8 +3,7 @@ %global gettext_package dbus-1 -%global expat_version 1.95.5 -%global libselinux_version 1.15.2 +%global libselinux_version 2.0.86 %global dbus_user_uid 81 @@ -17,7 +16,7 @@ Name: dbus Epoch: 1 -Version: 1.11.12 +Version: 1.11.14 Release: 1%{?dist} Summary: D-BUS message bus @@ -32,11 +31,11 @@ Source1: 00-start-message-bus.sh BuildRequires: autoconf-archive BuildRequires: libtool -BuildRequires: expat-devel >= %{expat_version} -BuildRequires: libselinux-devel >= %{libselinux_version} BuildRequires: audit-libs-devel >= 0.9 BuildRequires: libX11-devel BuildRequires: libcap-ng-devel +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(libselinux) >= %{libselinux_version} BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(systemd) BuildRequires: doxygen @@ -58,7 +57,7 @@ Requires(pre): /usr/sbin/useradd # Note: These is only required for --with-tests; when bootstrapping, you can # pass --without-tests. %if %{with tests} -BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-2.0) >= 2.40.0 BuildRequires: dbus-python BuildRequires: pygobject3 %endif @@ -313,6 +312,7 @@ popd # behind these permissions %attr(4750,root,dbus) %{_libexecdir}/dbus-1/dbus-daemon-launch-helper %exclude %{_libexecdir}/dbus-1/dbus-run-installed-tests +%{_tmpfilesdir}/dbus.conf %{_unitdir}/dbus.service %{_unitdir}/dbus.socket %{_unitdir}/messagebus.service @@ -358,6 +358,9 @@ popd %changelog +* Thu Jun 29 2017 David King - 1:1.11.14-1 +- Update to 1.11.14 + * Fri Apr 07 2017 David King - 1:1.11.12-1 - Update to 1.11.12 diff --git a/sources b/sources index b10fefe..c77eddc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dbus-1.11.12.tar.gz) = 9d96e396b3b0e8b69cec78c3f124b0f6ba7ddbc257c5615cf874704a3359459a315ed9a74fdd3f635b4e711b42fe5ad01ce687bfecf6875e30b1ba4f14d0c4aa +SHA512 (dbus-1.11.14.tar.gz) = 533702f1eaa1bd35dc72b1781b8757c24d10f360e1472e543809a809874c95bf7d3aa12f43705d33456248ddc8a1d4284b9eeca5ba48d9b911d6344bceb3c95c From 375863c7dfd6b8e6f957a65b3148f16c14018607 Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 28 Jul 2017 14:24:12 +0100 Subject: [PATCH 5/6] Update to 1.11.16 --- .gitignore | 1 + dbus.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 619128a..1fa8c1a 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /dbus-1.11.10.tar.gz /dbus-1.11.12.tar.gz /dbus-1.11.14.tar.gz +/dbus-1.11.16.tar.gz diff --git a/dbus.spec b/dbus.spec index 6f8a7cc..6018247 100644 --- a/dbus.spec +++ b/dbus.spec @@ -16,7 +16,7 @@ Name: dbus Epoch: 1 -Version: 1.11.14 +Version: 1.11.16 Release: 1%{?dist} Summary: D-BUS message bus @@ -358,6 +358,9 @@ popd %changelog +* Fri Jul 28 2017 David King - 1:1.11.16-1 +- Update to 1.11.16 + * Thu Jun 29 2017 David King - 1:1.11.14-1 - Update to 1.11.14 diff --git a/sources b/sources index c77eddc..76a5168 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dbus-1.11.14.tar.gz) = 533702f1eaa1bd35dc72b1781b8757c24d10f360e1472e543809a809874c95bf7d3aa12f43705d33456248ddc8a1d4284b9eeca5ba48d9b911d6344bceb3c95c +SHA512 (dbus-1.11.16.tar.gz) = 991ba6293d5f305e5a7e4ce6b131ea7fddd3bebadbb5b8c2fec29ccb76ab324786a01b89d2df6a3a112756436549dc7b856e78d4adb3f7514c8537ad854741bc From e7a0507cd9e1bf846a7a2dc0df083c8a653996db Mon Sep 17 00:00:00 2001 From: David King Date: Wed, 27 Sep 2017 14:59:09 +0100 Subject: [PATCH 6/6] Update to 1.11.18 --- .gitignore | 1 + dbus.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1fa8c1a..39957dd 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /dbus-1.11.12.tar.gz /dbus-1.11.14.tar.gz /dbus-1.11.16.tar.gz +/dbus-1.11.18.tar.gz diff --git a/dbus.spec b/dbus.spec index 6018247..e1d2785 100644 --- a/dbus.spec +++ b/dbus.spec @@ -7,7 +7,7 @@ %global dbus_user_uid 81 -%global dbus_common_config_opts --enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-socket=/run/dbus/system_bus_socket --with-system-pid-file=/run/dbus/messagebus.pid --with-dbus-user=dbus --libexecdir=/%{_libexecdir}/dbus-1 --enable-user-session --docdir=%{_pkgdocdir} --enable-installed-tests +%global dbus_common_config_opts --enable-libaudit --enable-selinux=yes --with-system-socket=/run/dbus/system_bus_socket --with-dbus-user=dbus --libexecdir=/%{_libexecdir}/dbus-1 --enable-user-session --docdir=%{_pkgdocdir} --enable-installed-tests # Allow extra dependencies required for some tests to be disabled. %bcond_without tests @@ -16,7 +16,7 @@ Name: dbus Epoch: 1 -Version: 1.11.16 +Version: 1.11.18 Release: 1%{?dist} Summary: D-BUS message bus @@ -173,8 +173,6 @@ install --directory %{buildroot}%{_datadir}/dbus-1/interfaces ln -s dbus.service %{buildroot}%{_unitdir}/messagebus.service ## %find_lang %{gettext_package} -# Delete the old legacy sysv init script -rm -rf %{buildroot}%{_initrddir} install --directory %{buildroot}/var/lib/dbus @@ -358,6 +356,9 @@ popd %changelog +* Wed Sep 27 2017 David King - 1:1.11.18-1 +- Update to 1.11.18 + * Fri Jul 28 2017 David King - 1:1.11.16-1 - Update to 1.11.16 diff --git a/sources b/sources index 76a5168..631f68f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dbus-1.11.16.tar.gz) = 991ba6293d5f305e5a7e4ce6b131ea7fddd3bebadbb5b8c2fec29ccb76ab324786a01b89d2df6a3a112756436549dc7b856e78d4adb3f7514c8537ad854741bc +SHA512 (dbus-1.11.18.tar.gz) = daf7738cde405e517e46d8c5ac1d148245e135eb0d2806c8e96de4e59af1949bad3fce8ee928c2e05403566f93f6bb65edaee47ca9576a3f5f5a4d0dcbfeb8ef