From 2caccfe4d045ee07f7445d501c75f630f719721c2797e26769f1fe547f712dee Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Mon, 25 Nov 2019 07:41:18 +0000 Subject: [PATCH] Accepting request 750673 from home:plater - Remove conflict between current libdbus-c++-devel and libdbus-c++-glib-devel. OBS-URL: https://build.opensuse.org/request/show/750673 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdbus-c++?expand=0&rev=34 --- libdbus-c++-api-docs.changes | 6 ++++++ libdbus-c++-glib.changes | 6 ++++++ libdbus-c++.changes | 6 ++++++ libdbus-c++.spec | 7 ++++++- 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/libdbus-c++-api-docs.changes b/libdbus-c++-api-docs.changes index be172ab..d6d73e0 100644 --- a/libdbus-c++-api-docs.changes +++ b/libdbus-c++-api-docs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 25 07:34:29 UTC 2019 - Dave Plater + +- Remove conflict between current libdbus-c++-devel and + libdbus-c++-glib-devel. + ------------------------------------------------------------------- Fri Nov 22 00:37:29 UTC 2019 - Stefan Brüns diff --git a/libdbus-c++-glib.changes b/libdbus-c++-glib.changes index be172ab..d6d73e0 100644 --- a/libdbus-c++-glib.changes +++ b/libdbus-c++-glib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 25 07:34:29 UTC 2019 - Dave Plater + +- Remove conflict between current libdbus-c++-devel and + libdbus-c++-glib-devel. + ------------------------------------------------------------------- Fri Nov 22 00:37:29 UTC 2019 - Stefan Brüns diff --git a/libdbus-c++.changes b/libdbus-c++.changes index be172ab..d6d73e0 100644 --- a/libdbus-c++.changes +++ b/libdbus-c++.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 25 07:34:29 UTC 2019 - Dave Plater + +- Remove conflict between current libdbus-c++-devel and + libdbus-c++-glib-devel. + ------------------------------------------------------------------- Fri Nov 22 00:37:29 UTC 2019 - Stefan Brüns diff --git a/libdbus-c++.spec b/libdbus-c++.spec index c83f6cf..8dc6fe6 100644 --- a/libdbus-c++.spec +++ b/libdbus-c++.spec @@ -101,7 +101,12 @@ 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}-%{release} +%if 0%{?suse_version} <= 1500 +%if %{with glib} +Requires: libdbus-c++-devel = %{version}-%{release} +%endif +%endif %description devel DBus-c++ provides a C++ API for D-BUS. The library has