From f7853612c8350396a20c9ba3f313c799a76c99bc8a65045e4e5c9f51b98d76bb Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 19 May 2011 05:27:54 +0000 Subject: [PATCH] Accepting request 70598 from home:adra:branches:multimedia:libs Update to version 1.7, Spec file updates, Updated taglib.desktop, Updated baselibs.conf OBS-URL: https://build.opensuse.org/request/show/70598 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/taglib?expand=0&rev=14 --- baselibs.conf | 3 +- taglib-1.6.3.tar.bz2 | 3 - taglib-1.7.tar.bz2 | 3 + taglib.changes | 34 +++++++++ taglib.desktop | 2 +- taglib.spec | 176 +++++++++++++++++++++++++++---------------- 6 files changed, 151 insertions(+), 70 deletions(-) delete mode 100644 taglib-1.6.3.tar.bz2 create mode 100644 taglib-1.7.tar.bz2 diff --git a/baselibs.conf b/baselibs.conf index d54c597..898d5b2 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1,2 @@ -taglib +libtag1 +libtag_c0 diff --git a/taglib-1.6.3.tar.bz2 b/taglib-1.6.3.tar.bz2 deleted file mode 100644 index e3db39c..0000000 --- a/taglib-1.6.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aaeb64c3b95d41d3153dec0d85591d5f31a746931785e580ead07c9a60a9ddf6 -size 846079 diff --git a/taglib-1.7.tar.bz2 b/taglib-1.7.tar.bz2 new file mode 100644 index 0000000..cadff1f --- /dev/null +++ b/taglib-1.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89e69f0e28fd28ee1aac11f737943d6d953f682234915b50184b608be7c413cb +size 458587 diff --git a/taglib.changes b/taglib.changes index 101c388..6fac72f 100644 --- a/taglib.changes +++ b/taglib.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Tue May 17 20:55:51 UTC 2011 - asterios.dramis@gmail.com + +- Update to version 1.7: + * Fixed memory leaks in the FLAC file format parser. + * Fixed bitrate calculation for WAV files. + From 1.7 RC1 + * Support for reading/writing tags from Monkey's Audio files. (BUG:210404) + * Support for reading/writing embedded pictures from WMA files. + * Support for reading/writing embedded pictures from FLAC files (BUG:218696). + * Implemented APE::Tag::isEmpty() to check for all APE tags, not just the + basic ones. + * Added reading of WAV audio length. (BUG:116033) + * Exposed FLAC MD5 signature of the uncompressed audio stream via + FLAC::Properties::signature(). (BUG:160172) + * Added function ByteVector::toHex() for hex-encoding of byte vectors. + * WavPack reader now tries to get the audio length by finding the final + block, if the header doesn't have the information. (BUG:258016) + * Fixed a memory leak in the ID3v2.2 PIC frame parser. (BUG:257007) + * Fixed writing of RIFF files with even chunk sizes. (BUG:243954) + * Fixed compilation on MSVC 2010. + * Removed support for building using autoconf/automake. + * API docs can be now built using "make docs". +- Spec file updates: + * Changes based on openSUSE shared library packaging policy (added libtag1, + libtag_c0 and libtag-devel packages, removed taglib and taglib-devel + packages). + * Changes based on spec-cleaner run. + * Changed License: to LGPLv2.1+ ; MPLv1.1 .. + * Updates in Group, Summary and %description entries. + * Added libcppunit-devel and pkg-config in BuildRequires. + * Minor other updates. +- Updated taglib.desktop for susehelp to point to libtag-devel. + ------------------------------------------------------------------- Sat Feb 26 14:24:48 UTC 2011 - toddrme2178@gmail.com diff --git a/taglib.desktop b/taglib.desktop index d7d9559..11403e6 100644 --- a/taglib.desktop +++ b/taglib.desktop @@ -2,5 +2,5 @@ Name=Taglib API reference Name[de]=Taglib API Referenz Name[hu]=Taglib API referencia -DocPath=/usr/share/doc/packages/taglib/html/index.html +DocPath=/usr/share/doc/packages/libtag-devel/html/index.html X-DOC-SearchMethod=htdig diff --git a/taglib.spec b/taglib.spec index 1efe731..e6a20e3 100644 --- a/taglib.spec +++ b/taglib.spec @@ -19,84 +19,122 @@ Name: taglib -BuildRequires: cmake doxygen gcc-c++ graphviz update-desktop-files zlib-devel -%if %suse_version > 1020 -BuildRequires: fdupes -%endif -License: LGPLv2.1+ ; MPL .. -Group: Development/Libraries/C and C++ -Summary: C++ Library to Parse Metadata in Media Files -Url: http://ktown.kde.org/~wheeler/taglib/ -# bug437293 -%ifarch ppc64 -Obsoletes: taglib-64bit -%endif -# -Version: 1.6.3 +Version: 1.7 Release: 1 -Source0: %name-%version.tar.bz2 -Source1: %name.desktop -Source2: baselibs.conf +License: LGPLv2.1+ ; MPLv1.1 .. +Summary: Audio Meta-Data Library +Url: http://ktown.kde.org/~wheeler/taglib/ +Group: System/Libraries +# http://ktown.kde.org/~wheeler/files/src/taglib-1.7.tar.gz +Source0: %{name}-%{version}.tar.bz2 +Source1: %{name}.desktop +Source100: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: cmake +BuildRequires: doxygen +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: graphviz +BuildRequires: libcppunit-devel +BuildRequires: pkg-config +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif +BuildRequires: zlib-devel %description -libtag provides a C++ interface for reading additional data (stored in -TAGs) from MP3, Ogg Vorbis, and MPEG files. +TagLib is a library for reading and editing the meta-data of several popular +audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg +Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack +TrueAudio, WAV, AIFF, MP4 and ASF files. - - -Authors: --------- - Scott Wheeler - -%package devel -Group: Development/Libraries/C and C++ +%package -n libtag1 License: LGPLv2.1+ -Summary: C++ Library to Parse Metadata in media files -Requires: taglib = %{version} libstdc++-devel +Summary: Audio Meta-Data Library +Group: System/Libraries # bug437293 %ifarch ppc64 +Obsoletes: libtag1-64bit +%endif +# + +%description -n libtag1 +TagLib is a library for reading and editing the meta-data of several popular +audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg +Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack +TrueAudio, WAV, AIFF, MP4 and ASF files. + +%package -n libtag_c0 +License: LGPLv2.1+ +Summary: Audio Meta-Data Library +Group: System/Libraries +# bug437293 +%ifarch ppc64 +Obsoletes: libtag_c0-64bit +%endif +# + +%description -n libtag_c0 +TagLib is a library for reading and editing the meta-data of several popular +audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg +Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC, Speex, WavPack +TrueAudio, WAV, AIFF, MP4 and ASF files. + +%package -n libtag-devel +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) +Provides: taglib-devel = %{version} +Obsoletes: taglib-devel < 0.6.3 +# bug437293 +%ifarch ppc64 +Obsoletes: libtag-devel-64bit Obsoletes: taglib-devel-64bit %endif # -%description devel -libtag provides a C++ interface for reading additional data (stored in -TAGs) from MP3, Ogg Vorbis, and MPEG files. - - - -Authors: --------- - Scott Wheeler +%description -n libtag-devel +This package contains development files for taglib. %prep %setup -q -#%{__make} -f Makefile.cvs %build +mkdir build +cd build export CXXFLAGS="%{optflags}" export CFLAGS="%{optflags}" -_libsuffix=$(echo %_lib | cut -b4-) -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_TESTS:BOOL=ON -DLIB_SUFFIX=$_libsuffix -DWITH_ASF:BOOL=ON -DWITH_MP4:BOOL=ON . -%{__make} %{?jobs:-j %jobs} VERBOSE=1 -cd doc -doxygen taglib.doxygen +_libsuffix=$(echo %{_lib} | cut -b4-) +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_TESTS:BOOL=ON -DLIB_SUFFIX=$_libsuffix -DWITH_ASF:BOOL=ON -DWITH_MP4:BOOL=ON .. +make %{?_smp_mflags} VERBOSE=1 +cd .. + +doxygen %install -%{__make} DESTDIR="%{buildroot}" install +cd build +%makeinstall +cd .. + # install susehelp file -%{__mkdir_p} %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/ -%{__install} -m 0644 %SOURCE1 \ - %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/ -%suse_update_desktop_file %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/%name.desktop -%{__mkdir_p} %{buildroot}%_defaultdocdir/%name -%{__cp} -a AUTHORS doc/html \ - %{buildroot}%_defaultdocdir/%name/ -%if %suse_version > 1020 -%fdupes %{buildroot} +mkdir -p %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/ +install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/ + +%if 0%{?suse_version} +%suse_update_desktop_file %{buildroot}%{_datadir}/susehelp/meta/Development/Libraries/%{name}.desktop %endif +# Documentation +mkdir -p %{buildroot}%{_defaultdocdir}/libtag-devel +rm -f examples/CMake* +cp -a AUTHORS COPYING.LGPL COPYING.MPL NEWS doc/html/ examples/ %{buildroot}%{_defaultdocdir}/libtag-devel/ + +%fdupes -s %{buildroot} + %check # check the library #pushd tests @@ -104,23 +142,31 @@ doxygen taglib.doxygen #popd %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} -%post -p /sbin/ldconfig +%post -n libtag1 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libtag1 -p /sbin/ldconfig -%files -%defattr(-,root,root) -%{_libdir}/libtag*.so.* +%post -n libtag_c0 -p /sbin/ldconfig -%files devel -%defattr(-,root,root) -%doc %_defaultdocdir/%name -%{_datadir}/susehelp +%postun -n libtag_c0 -p /sbin/ldconfig + +%files -n libtag1 +%defattr(-,root,root,-) +%{_libdir}/libtag.so.1* + +%files -n libtag_c0 +%defattr(-,root,root,-) +%{_libdir}/libtag_c.so.0* + +%files -n libtag-devel +%defattr(-,root,root,-) +%doc %{_defaultdocdir}/libtag-devel/ %{_bindir}/taglib-config -%{_includedir}/taglib +%{_includedir}/taglib/ %{_libdir}/libtag*.so %{_libdir}/pkgconfig/*.pc +%{_datadir}/susehelp/ %changelog