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
This commit is contained in:
Dave Plater 2019-11-25 07:41:18 +00:00 committed by Git OBS Bridge
parent 07585c04d6
commit 2caccfe4d0
4 changed files with 24 additions and 1 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Nov 25 07:34:29 UTC 2019 - Dave Plater <davejplater@gmail.com>
- Remove conflict between current libdbus-c++-devel and
libdbus-c++-glib-devel.
-------------------------------------------------------------------
Fri Nov 22 00:37:29 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Nov 25 07:34:29 UTC 2019 - Dave Plater <davejplater@gmail.com>
- Remove conflict between current libdbus-c++-devel and
libdbus-c++-glib-devel.
-------------------------------------------------------------------
Fri Nov 22 00:37:29 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Nov 25 07:34:29 UTC 2019 - Dave Plater <davejplater@gmail.com>
- Remove conflict between current libdbus-c++-devel and
libdbus-c++-glib-devel.
-------------------------------------------------------------------
Fri Nov 22 00:37:29 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

View File

@ -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