From b56bd0fa3687483bd9ab648582e6ecaff50946a7b19a8ad112132e486750ca4b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 23 Feb 2023 14:02:44 +0000 Subject: [PATCH 1/2] Accepting request 1066638 from home:gmbr3:Active - Packaging changes: * Move missed scriptlets and links for dbus.socket to common * Move sysusers and tmpfiles scriptlets, and ghost files to common * Move dbus-launch man page to correct package OBS-URL: https://build.opensuse.org/request/show/1066638 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=332 --- dbus-1.changes | 9 +++++++++ dbus-1.spec | 49 ++++++++++++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 19 deletions(-) diff --git a/dbus-1.changes b/dbus-1.changes index 577b755..4d36b26 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Feb 19 13:57:54 UTC 2023 - Callum Farmer + +- Packaging changes: + * Move missed scriptlets and links for dbus.socket to common + * Move sysusers and tmpfiles scriptlets, and ghost files to + common + * Move dbus-launch man page to correct package + ------------------------------------------------------------------- Fri Feb 10 15:24:52 UTC 2023 - Dominique Leuenberger diff --git a/dbus-1.spec b/dbus-1.spec index 2df361a..9d2fb5c 100644 --- a/dbus-1.spec +++ b/dbus-1.spec @@ -53,7 +53,6 @@ Requires(post): %{_libname} = %{version} Requires(post): diffutils Requires(pre): permissions Provides: dbus-launch = %{version} -%sysusers_requires %if %{with selinux} BuildRequires: libselinux-devel %endif @@ -71,6 +70,7 @@ Requires: dbus-1-common >= %{version} %package common Summary: D-BUS message bus configuration BuildArch: noarch +%sysusers_requires %package daemon Summary: D-Bus message bus daemon @@ -199,14 +199,29 @@ rm -Rf %{buildroot}%{_datadir}/doc/dbus %post -n %{_libname} -p /sbin/ldconfig %postun -n %{_libname} -p /sbin/ldconfig -%pre -f messagebus.pre -%service_add_pre dbus.service dbus.socket +%pre +%service_add_pre dbus.service # removing old update-alternatives entries if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then %{_sbindir}/update-alternatives --remove dbus-launch %{_bindir}/dbus-launch.nox11 fi %post +/sbin/ldconfig +%set_permissions %{_libexecdir}/dbus-1/dbus-daemon-launch-helper +%service_add_post dbus.service + +%preun +%service_del_preun dbus.service + +%postun +%service_del_postun_without_restart dbus.service + +%pre common -f messagebus.pre +%service_add_pre dbus.socket +%tmpfiles_create %{_prefix}/lib/tmpfiles.d/dbus.conf + +%post common if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id ]; then cmp -s %{_localstatedir}/lib/dbus/machine-id %{_sysconfdir}/machine-id > /dev/null if [ $? ]; then @@ -217,20 +232,15 @@ if [ ! -L %{_localstatedir}/lib/dbus/machine-id ]; then mkdir -p %{_localstatedir}/lib/dbus/ ln -s %{_sysconfdir}/machine-id %{_localstatedir}/lib/dbus/machine-id fi +%service_add_post dbus.socket -/sbin/ldconfig -%set_permissions %{_libexecdir}/dbus-1/dbus-daemon-launch-helper -%service_add_post dbus.service dbus.socket -%tmpfiles_create %{_prefix}/lib/tmpfiles.d/dbus.conf +%preun common +%service_del_preun dbus.socket -%preun -%service_del_preun dbus.service dbus.socket - -%postun -%service_del_postun_without_restart dbus.service dbus.socket +%postun common +%service_del_postun_without_restart dbus.socket %files -%dir %{_localstatedir}/lib/dbus %dir %{_libexecdir}/dbus-1/ %license COPYING %doc AUTHORS NEWS README @@ -238,24 +248,25 @@ fi # See doc/system-activation.txt in source tarball for the rationale # behind these permissions %attr(4750,root,messagebus) %verify(not mode) %{_libexecdir}/dbus-1/dbus-daemon-launch-helper -%ghost /run/dbus -%ghost %{_localstatedir}/lib/dbus/machine-id %{_unitdir}/dbus.service +%{_sbindir}/rcdbus %dir %{_unitdir}/multi-user.target.wants %{_unitdir}/multi-user.target.wants/dbus.service -%dir %{_unitdir}/sockets.target.wants -%{_unitdir}/sockets.target.wants/dbus.socket %{_userunitdir}/dbus.service %dir %{_datadir}/libalternatives %dir %{_datadir}/libalternatives/dbus-launch %{_datadir}/libalternatives/dbus-launch/10.conf %{_bindir}/dbus-launch.nox11 %{_bindir}/dbus-launch +%{_mandir}/man1/dbus-launch.1%{?ext_man} %files -n %{_libname} %{_libdir}/libdbus-1.so.* %files common +%dir %{_localstatedir}/lib/dbus +%ghost /run/dbus +%ghost %{_localstatedir}/lib/dbus/machine-id %config(noreplace) %{_sysconfdir}/dbus-1/session.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.conf %dir %{_sysconfdir}/dbus-1 @@ -268,6 +279,8 @@ fi %dir %{_datadir}/dbus-1/system-services %dir %{_userunitdir}/sockets.target.wants %{_userunitdir}/sockets.target.wants/dbus.socket +%dir %{_unitdir}/sockets.target.wants +%{_unitdir}/sockets.target.wants/dbus.socket %{_prefix}/lib/sysusers.d/dbus.conf %{_prefix}/lib/tmpfiles.d/dbus.conf %{_datadir}/dbus-1/session.conf @@ -284,8 +297,6 @@ fi %{_mandir}/man1/dbus-daemon.1%{?ext_man} %{_mandir}/man1/dbus-run-session.1%{?ext_man} %{_mandir}/man1/dbus-test-tool.1%{?ext_man} -%{_mandir}/man1/dbus-launch.1%{?ext_man} -%{_sbindir}/rcdbus %files devel %{_includedir}/* From b54e0829fa2660734d6fbd4b3cdbbd812e412c38e9ef7c20e896937f2c2b0c48 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Thu, 23 Feb 2023 23:38:21 +0000 Subject: [PATCH 2/2] Accepting request 1067438 from home:gmbr3:Active - Move %tmpfiles_create to %post otherwise the file won't exist since it is now located in the correct package OBS-URL: https://build.opensuse.org/request/show/1067438 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=333 --- dbus-1.changes | 6 ++++++ dbus-1.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dbus-1.changes b/dbus-1.changes index 4d36b26..7038e2e 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 23 14:48:12 UTC 2023 - Callum Farmer + +- Move %tmpfiles_create to %post otherwise the file won't exist + since it is now located in the correct package + ------------------------------------------------------------------- Sun Feb 19 13:57:54 UTC 2023 - Callum Farmer diff --git a/dbus-1.spec b/dbus-1.spec index 9d2fb5c..c750f8f 100644 --- a/dbus-1.spec +++ b/dbus-1.spec @@ -219,7 +219,6 @@ fi %pre common -f messagebus.pre %service_add_pre dbus.socket -%tmpfiles_create %{_prefix}/lib/tmpfiles.d/dbus.conf %post common if [ -e %{_localstatedir}/lib/dbus/machine-id -a -e %{_sysconfdir}/machine-id ]; then @@ -232,6 +231,7 @@ if [ ! -L %{_localstatedir}/lib/dbus/machine-id ]; then mkdir -p %{_localstatedir}/lib/dbus/ ln -s %{_sysconfdir}/machine-id %{_localstatedir}/lib/dbus/machine-id fi +%tmpfiles_create %{_prefix}/lib/tmpfiles.d/dbus.conf %service_add_post dbus.socket %preun common