From 5d80d44e2c19835e7ed51bbc86be7449944f248435fda8841462ec3bd9d85ec1 Mon Sep 17 00:00:00 2001
From: Dave Plater <davejplater@gmail.com>
Date: Sat, 28 May 2011 05:16:20 +0000
Subject: [PATCH] - Conflict the last version of taglib that contained the
 libraries   from the library subpackages. - Make sure the devel package
 obsoletes the last version of   taglib-devel where the main package contained
 the libraries. - taglib is the name of the srcrpm, moved docs to devel
 subpackage.

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/taglib?expand=0&rev=26
---
 taglib.changes | 10 +++++-----
 taglib.spec    | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/taglib.changes b/taglib.changes
index 40bfe87..908f055 100644
--- a/taglib.changes
+++ b/taglib.changes
@@ -1,11 +1,11 @@
 -------------------------------------------------------------------
 Sat May 28 04:31:40 UTC 2011 - davejplater@gmail.com
 
-- Obsolete the last version of taglib that contained the libraries.
-- Make the devel sub package require taglib which only contains doc
-  and make taglib require the two library sub packages.
-- Make the two library sub packages require taglib to ensure that
-  the old taglib package is actually removed.
+- Conflict the last version of taglib that contained the libraries
+  from the library subpackages.
+- Make sure the devel package obsoletes the last version of
+  taglib-devel where the main package contained the libraries.
+- taglib is the name of the srcrpm, moved docs to devel subpackage.
 
 -------------------------------------------------------------------
 Wed May 25 14:19:41 UTC 2011 - coolo@novell.com
diff --git a/taglib.spec b/taglib.spec
index 608e7e3..2775d55 100644
--- a/taglib.spec
+++ b/taglib.spec
@@ -41,8 +41,6 @@ BuildRequires:  pkg-config
 BuildRequires:  update-desktop-files
 %endif
 BuildRequires:  zlib-devel
-Requires:       libtag1 = %{version}-%{release}
-Requires:       libtag_c0 = %{version}-%{release}
 
 %description
 TagLib is a library for reading and editing the meta-data of several popular
@@ -54,7 +52,9 @@ TrueAudio, WAV, AIFF, MP4 and ASF files.
 License:        LGPLv2.1+
 Summary:        Audio Meta-Data Library
 Group:          System/Libraries
-Requires:       taglib = %{version}-%{release}
+# Without this the old taglib package containing the libraries isn't removed when this package is installed.
+# The only alternative is for the libraries to Require: taglib version-release, badness 440
+Conflicts:       taglib <= 1.6.3
 
 %description -n libtag1
 TagLib is a library for reading and editing the meta-data of several popular
@@ -66,7 +66,9 @@ TrueAudio, WAV, AIFF, MP4 and ASF files.
 License:        LGPLv2.1+
 Summary:        Audio Meta-Data Library
 Group:          System/Libraries
-Requires:       taglib = %{version}-%{release}
+# Without this the old taglib package containing the libraries isn't removed when this package is installed.
+# The only alternative is for the libraries to Require: taglib version-release, badness 440
+Conflicts:       taglib <= 1.6.3
 
 %description -n libtag_c0
 TagLib is a library for reading and editing the meta-data of several popular
@@ -79,7 +81,8 @@ License:        LGPLv2.1+
 Summary:        Development files for taglib
 Group:          Development/Libraries/C and C++
 Requires:       libstdc++-devel
-Requires:       taglib = %{version}-%{release}
+Requires:       libtag_c0 = %{version}-%{release}
+Requires:       libtag1 = %{version}-%{release}
 # taglib-devel was last used in openSUSE 11.4 (taglib-devel-1.6.2)
 # The last taglib-devel used was version 1.6.3 from multimedia:libs.
 Provides:       taglib-devel = %{version}
@@ -163,9 +166,6 @@ EOF
 %{_libdir}/libtag*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/susehelp/
-
-%files
-%defattr(-,root,root,-)
 %doc README.taglib
 
 %changelog