rpms/taglib/F-10 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 taglib.spec, 1.30, 1.31 taglib-1.5-kde#161721.patch, 1.1, NONE

Mon Sep 14 08:02:18 UTC 2009

Author: mschwendt

Update of /cvs/pkgs/rpms/taglib/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13305

Modified Files:
	.cvsignore sources taglib.spec 
Removed Files:
	taglib-1.5-kde#161721.patch 
Log Message:
sync with 1.6 final from Rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12

--- .cvsignore	21 Feb 2008 02:44:59 -0000	1.11
+++ .cvsignore	14 Sep 2009 08:02:18 -0000	1.12
@@ -1 +1 @@
-taglib-1.5.tar.gz
+taglib-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	21 Feb 2008 02:44:59 -0000	1.11
+++ sources	14 Sep 2009 08:02:18 -0000	1.12
@@ -1 +1 @@
-7b557dde7425c6deb7bbedd65b4f2717  taglib-1.5.tar.gz
+5ecad0816e586a954bd676a86237d054  taglib-1.6.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/taglib.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- taglib.spec	6 Oct 2008 20:54:30 -0000	1.30
+++ taglib.spec	14 Sep 2009 08:02:18 -0000	1.31
@@ -1,15 +1,26 @@
 
-# cvsadmin: http://bugzilla.redhat.com/418271
+# Fedora cvs admin requests for taglib: http://bugzilla.redhat.com/418271
+
+%bcond_without tests
+
+%if %{with tests}
+%global buildtests -DBUILD_TESTS=ON
+%endif
+
+%bcond_without doc
+%global apidocdir __api-doc_fedora
 
 Name:       taglib	
-Version:    1.5
-Release:    2%{?dist}
+Version:    1.6
+Release:    1%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
 License:    LGPLv2
 URL:        http://developer.kde.org/~wheeler/taglib.html
-Source0:    http://developer.kde.org/~wheeler/files/src/taglib-%{version}.tar.gz
+# the temporary url from the 1.6 announcement
+Source0:    http://ftp.musicbrainz.org/pub/musicbrainz/users/luks/taglib/taglib-1.6.tar.gz
+#Source0:    http://developer.kde.org/~wheeler/files/src/taglib-%{version}.tar.gz
 #Source0:    taglib-%{svn}.tar.gz
 # The svn tarball is generated with the following script
 Source1:    taglib-svn.sh
@@ -21,44 +32,73 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
-## upstream patches
-Patch100: taglib-1.5-kde#161721.patch
-
 BuildRequires: cmake
+BuildRequires: pkgconfig
 BuildRequires: zlib-devel
+%if %{with tests}
+BuildRequires: cppunit-devel
+%endif
+%if %{with doc}
+BuildRequires: doxygen
+BuildRequires: graphviz
+%endif
+
 
 %description
 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 files.
+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 files, as well as APE Tags.
+
+
+%if %{with doc}
+%package doc
+Summary: API Documentation for %{name}
+Group: Documentation
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+
+%description doc
+This is API documentation generated from the TagLib source code.
+%endif
+
 
 %package devel
 Summary: Development files for %{name} 
 Group:	 Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+%if ! %{with doc}
+Obsoletes: %{name}-doc
+%endif
+
 %description devel
-%{summary}.
+Files needed when building software with %{name}.
 
 
 %prep
 %setup -q -n taglib-%{version}%{?beta}
 
+# patch1 not applied
 ## omit for now
 %patch2 -p1 -b .multilib
 
-%patch100 -p1 -b .kde#161721.patch
-
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} ..
+%{cmake} %{?buildtests} -DWITH_ASF=1 -DWITH_MP4=1 ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+%if %{with doc}
+cd doc
+doxygen taglib.doxygen
+cd -
+%endif
+
 
 %install
 rm -rf %{buildroot}
@@ -66,9 +106,24 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 rm -fr examples/.deps
-rm -fr examples/Makefile*
+rm -fr examples/Makefile* examples/CMake*
 rm -f %{buildroot}%{_libdir}/lib*.la
 
+%if %{with doc}
+rm -fr %{apidocdir} ; mkdir %{apidocdir}
+cp -a doc/html doc/*.png %{apidocdir}
+ln -s html/index.html %{apidocdir}
+find %{apidocdir} -name '*.md5' | xargs rm
+%endif
+
+
+%if %{with tests}
+%check
+cp -a tests/data %{_target_platform}/tests
+cd %{_target_platform}
+LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make check
+%endif
+
 
 %clean
 rm -rf %{buildroot}
@@ -92,8 +147,67 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 
+%if %{with doc}
+%files doc
+%defattr(-,root,root,-)
+%doc %{apidocdir}/*
+%endif
+
 
 %changelog
+* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
+- Update to 1.6 final.
+
+* Sun Sep  6 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-0.1.rc1
+- Update to 1.6rc1 (further bug-fixes and support for AIFF and WAV).
+- Build optional support for MP4 and ASF/WMA files.
+
+* Fri Sep  4 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-8
+- Merge another bug-fix from 1.6rc1 (this adds 3 symbols) and
+  really add tstring bug-fix:
+  * Split Ogg packets larger than 64k into multiple pages. (BUG:171957)
+  * Fixed a possible crash in the non-const version of String::operator[]
+    and in String::operator+=. (BUG:169389)
+
+* Sun Aug 23 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-7
+- Build API documentation into -doc package.
+
+* Sat Aug 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-6
+- Add %%check section and conditionally build with tests.
+- Update descriptions (and mention the additional file formats).
+- Cherry-pick bug-fix patches from 1.6 development (also replaces the
+  old taglib-1.5-kde#161721.patch):
+  * Fixed crash when saving a Locator APEv2 tag. (BUG:169810)
+  * TagLib can now use FLAC padding block. (BUG:107659)
+  * Fixed overflow while calculating bitrate of FLAC files with a very
+    high bitrate.
+  * XiphComment::year() now falls back to YEAR if DATE doesn't exist
+    and XiphComment::year() falls back to TRACKNUM if TRACKNUMBER doesn't
+    exist. (BUG:144396)
+  * Fixed a bug in ByteVectorList::split().
+  * Fixed a possible crash in the non-const version of String::operator[]
+    and in String::operator+=. (BUG:169389)
+  * ID3v2.2 frames are now not incorrectly saved. (BUG:176373)
+  * Support for ID3v2.2 PIC frames. (BUG:167786)
+  * Improved ID3v2.3 genre parsing. (BUG:188578)
+  * Better checking of corrupted ID3v2 APIC data. (BUG:168382)
+  * Bitrate calculating using the Xing header now uses floating point
+    numbers. (BUG:172556)
+  * Added support for PRIV ID3v2 frames.
+  * Empty ID3v2 genres are no longer treated as numeric ID3v1 genres.
+  * Added support for the POPM (rating/playcount) ID3v2 frame.
+  * Fixed crash on handling unsupported ID3v2 frames, e.g. on encrypted
+    frames. (BUG:161721)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Dec 12 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5-3
+- rebuild for pkgconfig deps
+
 * Mon Oct 06 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5-2
 - Encrypted frames taglib/Amarok crash (kde#161721)
 


--- taglib-1.5-kde#161721.patch DELETED ---


