rpms/taglib/F-10 taglib-1.6-test_mp4.patch, 1.2, 1.3 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 taglib.spec, 1.33, 1.34 taglib-1.5-1.6-ape.patch, 1.1, NONE taglib-1.5-1.6-flac.patch, 1.1, NONE taglib-1.5-1.6-mpeg-cmake.patch, 1.1, NONE taglib-1.5-1.6-mpeg.patch, 1.1, NONE taglib-1.5-1.6-ogg.patch, 1.1, NONE taglib-1.5-1.6-toolkit.patch, 1.1, NONE taglib-1.5-tests.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore sources taglib.spec 
Added Files:
	taglib-1.6-test_mp4.patch 
Removed Files:
	taglib-1.5-1.6-ape.patch taglib-1.5-1.6-flac.patch 
	taglib-1.5-1.6-mpeg-cmake.patch taglib-1.5-1.6-mpeg.patch 
	taglib-1.5-1.6-ogg.patch taglib-1.5-1.6-toolkit.patch 
	taglib-1.5-tests.patch 
Log Message:
sync with devel/ branch for 1.6 goodness


taglib-1.6-test_mp4.patch:
 test_mp4.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: taglib-1.6-test_mp4.patch
===================================================================
RCS file: taglib-1.6-test_mp4.patch
diff -N taglib-1.6-test_mp4.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ taglib-1.6-test_mp4.patch	30 Sep 2009 16:33:02 -0000	1.3
@@ -0,0 +1,12 @@
+diff -Nur taglib-1.6-orig/tests/test_mp4.cpp taglib-1.6/tests/test_mp4.cpp
+--- taglib-1.6-orig/tests/test_mp4.cpp	2009-07-24 15:08:51.000000000 +0200
++++ taglib-1.6/tests/test_mp4.cpp	2009-09-14 14:46:41.724715605 +0200
+@@ -130,7 +130,7 @@
+     MP4::Atom *moov = atoms->atoms[0];
+     CPPUNIT_ASSERT_EQUAL(long(77), moov->length);
+ 
+-    f->tag()->itemListMap()["pgap"] = 1;
++    f->tag()->itemListMap()["pgap"] = true;
+     f->save();
+ 
+     f = new MP4::File(filename.c_str());


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-10/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	14 Sep 2009 17:09:37 -0000	1.13
+++ .cvsignore	30 Sep 2009 16:33:01 -0000	1.14
@@ -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.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	14 Sep 2009 17:09:37 -0000	1.13
+++ sources	30 Sep 2009 16:33:01 -0000	1.14
@@ -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.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- taglib.spec	14 Sep 2009 17:09:38 -0000	1.33
+++ taglib.spec	30 Sep 2009 16:33:02 -0000	1.34
@@ -11,8 +11,8 @@
 %global apidocdir __api-doc_fedora
 
 Name:       taglib	
-Version:    1.5
-Release:    9%{?dist}
+Version:    1.6
+Release:    2%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -30,15 +30,7 @@ Patch1:     taglib-1.5b1-multilib.patch 
 # try 2, kiss omit -L%_libdir
 Patch2:     taglib-1.5rc1-multilib.patch
 
-Patch3: taglib-1.5-tests.patch
-
-## upstream patches
-Patch101: taglib-1.5-1.6-ape.patch
-Patch102: taglib-1.5-1.6-ogg.patch
-Patch103: taglib-1.5-1.6-flac.patch
-Patch104: taglib-1.5-1.6-toolkit.patch
-Patch105: taglib-1.5-1.6-mpeg.patch
-Patch106: taglib-1.5-1.6-mpeg-cmake.patch
+Patch3: taglib-1.6-test_mp4.patch
 
 BuildRequires: cmake
 BuildRequires: pkgconfig
@@ -92,19 +84,13 @@ Files needed when building software with
 ## omit for now
 %patch2 -p1 -b .multilib
 
-%patch3 -p1 -b .tests
-%patch101 -p1 -b .ape
-%patch102 -p1 -b .ogg
-%patch103 -p1 -b .flac
-%patch104 -p1 -b .toolkit
-%patch105 -p1 -b .mpeg
-%patch106 -p1 -b .mpeg-build
+%patch3 -p1 -b .test_mp4
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} %{?buildtests} ..
+%{cmake} %{?buildtests} -DWITH_ASF=1 -DWITH_MP4=1 ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -152,7 +138,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING.LGPL
+%doc AUTHORS COPYING.LGPL NEWS
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -171,8 +157,16 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5-9
-- Merge minor changes in id3v2/ogg from 1.6 final.
+* Thu Sep 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-2
+- Include the new NEWS file as %%doc.
+
+* Mon Sep 14 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.6-1
+- Add patch to fix MP4 test on ppc/ppc64.
+- 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


--- taglib-1.5-1.6-ape.patch DELETED ---


--- taglib-1.5-1.6-flac.patch DELETED ---


--- taglib-1.5-1.6-mpeg-cmake.patch DELETED ---


--- taglib-1.5-1.6-mpeg.patch DELETED ---


--- taglib-1.5-1.6-ogg.patch DELETED ---


--- taglib-1.5-1.6-toolkit.patch DELETED ---


--- taglib-1.5-tests.patch DELETED ---