Accepting request 72240 from multimedia:libs

Added version to taglib requires (forwarded request 72239 from plater)

OBS-URL: https://build.opensuse.org/request/show/72240
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/taglib?expand=0&rev=25
This commit is contained in:
Sascha Peilicke 2011-05-31 11:18:50 +00:00 committed by Git OBS Bridge
commit 4701632d67
2 changed files with 31 additions and 24 deletions

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Sat May 28 07:03:00 UTC 2011 - davejplater@gmail.com
- Made taglib become a package again to satisfy the depencies of
packages that still require it.
-------------------------------------------------------------------
Sat May 28 04:31:40 UTC 2011 - davejplater@gmail.com
- 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

View File

@ -34,15 +34,15 @@ BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: graphviz
BuildRequires: graphviz-gnome
BuildRequires: libcppunit-devel
BuildRequires: pkg-config
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
BuildRequires: zlib-devel
Requires: libtag1 = %{version}-%{release}
Requires: libtag_c0 = %{version}-%{release}
Requires: libtag1 = %{version}
Requires: libtag_c0 = %{version}
%description
TagLib is a library for reading and editing the meta-data of several popular
@ -54,11 +54,9 @@ TrueAudio, WAV, AIFF, MP4 and ASF files.
License: LGPLv2.1+
Summary: Audio Meta-Data Library
Group: System/Libraries
# bug437293
%ifarch ppc64
Obsoletes: libtag1-64bit
%endif
#
# 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
@ -70,11 +68,9 @@ TrueAudio, WAV, AIFF, MP4 and ASF files.
License: LGPLv2.1+
Summary: Audio Meta-Data Library
Group: System/Libraries
# bug437293
%ifarch ppc64
Obsoletes: libtag_c0-64bit
%endif
#
# 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
@ -87,17 +83,12 @@ License: LGPLv2.1+
Summary: Development files for taglib
Group: Development/Libraries/C and C++
Requires: libstdc++-devel
Requires: libtag1 = %{version}
Requires: libtag_c0 = %{version}
# taglib-devel was last used in openSUSE 11.4 (taglib-devel-0.6.3)
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}
Obsoletes: taglib-devel <= 0.6.3
# bug437293
%ifarch ppc64
Obsoletes: libtag-devel-64bit
Obsoletes: taglib-devel-64bit
%endif
#
Obsoletes: taglib-devel <= 1.6.3
%description -n libtag-devel
This package contains development files for taglib.
@ -115,6 +106,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_TESTS:BOOL=ON -DLIB_SUFFIX=$_lib
make %{?_smp_mflags} VERBOSE=1
cd ..
doxygen -u
doxygen
%install
@ -171,7 +163,7 @@ EOF
%files -n libtag-devel
%defattr(-,root,root,-)
%doc %{_defaultdocdir}/libtag-devel/
%doc %{_defaultdocdir}/libtag-devel
%{_bindir}/taglib-config
%{_includedir}/taglib/
%{_libdir}/libtag*.so