From b21e15c3cc4e24860079378c5478b0cf0cc4f7199cf376602766cbec54e6d3a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 14 Nov 2013 09:54:20 +0000 Subject: [PATCH] - Avoid collisions with libcppunit. OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/cppunit?expand=0&rev=7 --- cppunit.changes | 5 +++++ cppunit.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/cppunit.changes b/cppunit.changes index ecdc674..a6e8acf 100644 --- a/cppunit.changes +++ b/cppunit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 14 09:51:33 UTC 2013 - tchvatal@suse.com + +- Avoid collisions with libcppunit. + ------------------------------------------------------------------- Wed Nov 13 09:54:32 UTC 2013 - tchvatal@suse.com diff --git a/cppunit.spec b/cppunit.spec index 1981ae6..47310c5 100644 --- a/cppunit.spec +++ b/cppunit.spec @@ -50,6 +50,9 @@ to develop applications that require these. Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} +Suggests: devel-doc = %{version} +Provides: libcppunit-devel = %{version} +Obsoletes: libcppunit-devel < %{version} %description devel This package contains all necessary include files and libraries needed @@ -58,6 +61,7 @@ to develop applications that require these. %package devel-doc Summary: Documentation for the cppunit API Group: Documentation/HTML +Conflicts: libcppunit-devel < 1.13.2 %if 0%{?suse_version} > 1200 BuildArch: noarch %endif