From b722e2a9da9f0130f0a0d8227dde706bf23d554320b4e9e8c89aa5ebbf314caa Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 20 Apr 2022 06:42:29 +0000 Subject: [PATCH] Accepting request 969711 from home:dimstar:Factory - Do not reference %release in requires/conflicts: with builds going across _multibuild, the rebuild counter of the two flavors is not guaranteed to be in sync (i.e glib flavor could build more often). OBS-URL: https://build.opensuse.org/request/show/969711 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdbus-c++?expand=0&rev=37 --- libdbus-c++.changes | 8 ++++++++ libdbus-c++.spec | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libdbus-c++.changes b/libdbus-c++.changes index 1dd2bda..5d4e03b 100644 --- a/libdbus-c++.changes +++ b/libdbus-c++.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Apr 13 07:23:25 UTC 2022 - Dominique Leuenberger + +- Do not reference %release in requires/conflicts: with builds + going across _multibuild, the rebuild counter of the two flavors + is not guaranteed to be in sync (i.e glib flavor could build more + often). + ------------------------------------------------------------------- Mon Nov 25 22:22:13 UTC 2019 - Stefan Brüns diff --git a/libdbus-c++.spec b/libdbus-c++.spec index afeec3f..8c45689 100644 --- a/libdbus-c++.spec +++ b/libdbus-c++.spec @@ -1,7 +1,7 @@ # -# spec file for package libdbus +# spec file # -# Copyright (c) 2020 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 @@ -101,10 +101,10 @@ Summary: Development files for libdbus-c++ Group: Development/Libraries/C and C++ Requires: libdbus-c++%{?psuffix}-1-%{sover} = %{version} Recommends: libdbus-c++-api-docs -Conflicts: libdbus-c++-devel < %{version}-%{release} +Conflicts: libdbus-c++-devel < %{version} %if 0%{?suse_version} <= 1500 %if %{with glib} -Requires: libdbus-c++-devel = %{version}-%{release} +Requires: libdbus-c++-devel = %{version} %endif %endif