From cc5060dfb7dc6b162bbc7e068c80a9065f0e7e3c73b85c61d45022b4edddc518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 2 Nov 2022 16:03:49 +0000 Subject: [PATCH] Accepting request 1032889 from home:dimstar:Factory - Try to guard against incomplete update stacks (boo#1202241): + Add split-provides to libdbus-1-glib and bash-completion sub-package. + Add explicit conflict to bash-completion subpackage against dbus-1-glib < 0.112 (when the package split happened) + Ensure dbus-1-glib-tool gets the correct library version installed. OBS-URL: https://build.opensuse.org/request/show/1032889 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1-glib?expand=0&rev=62 --- dbus-1-glib.changes | 11 +++++++++++ dbus-1-glib.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dbus-1-glib.changes b/dbus-1-glib.changes index 58d05df..339e188 100644 --- a/dbus-1-glib.changes +++ b/dbus-1-glib.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Nov 2 13:12:33 UTC 2022 - Dominique Leuenberger + +- Try to guard against incomplete update stacks (boo#1202241): + + Add split-provides to libdbus-1-glib and bash-completion + sub-package. + + Add explicit conflict to bash-completion subpackage against + dbus-1-glib < 0.112 (when the package split happened) + + Ensure dbus-1-glib-tool gets the correct library version + installed. + ------------------------------------------------------------------- Wed Dec 8 08:11:36 UTC 2021 - Dominique Leuenberger diff --git a/dbus-1-glib.spec b/dbus-1-glib.spec index dea90e2..4f5a780 100644 --- a/dbus-1-glib.spec +++ b/dbus-1-glib.spec @@ -1,7 +1,7 @@ # # spec file for package dbus-1-glib # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -45,6 +45,8 @@ GLib thread abstraction and main loop. Summary: GLib-based library for using D-Bus Provides: %{name} = %{version} Obsoletes: %{name} < %{version} +# Split provides: libdbus-glib-1.so.2 used to be in dbus-1-glib before 0.112 +Provides: %{name}:%{_libdir}/libdbus-glib-1.so.2 %description -n %{soname} D-Bus add-on library to integrate the standard D-Bus library with the @@ -75,6 +77,7 @@ This package contains developer documentation. %package -n dbus-1-glib-tool Summary: Tool package for D-Bus/GLib bindings +Requires: %{name} = %{version} %description -n dbus-1-glib-tool D-Bus add-on tool to integrate the standard D-Bus library with the @@ -86,6 +89,9 @@ This package contains dbus-binding-tool and manpage. Summary: Bash-completion package for D-Bus/GLib bindings Requires: dbus-1-glib-tool Supplements: (dbus-1-glib-tool and bash-completion) +# Up to version 0.112, the entire dbus-1-glib was in an unsplit package +Provides: dbus-1-glib:/etc/bash_completion.d/dbus-bash-completion.sh +Conflicts: dbus-1-glib < 0.112 %description bash-completion D-Bus add-on tool to integrate the standard D-Bus library with the