From 64fda57a88853ed7e0f90dff6b4c1a47d79ff447 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sat, 19 Feb 2011 19:35:51 -0600
Subject: [PATCH] taglib-1.7rc1

---
 .gitignore  |  3 ++-
 sources     |  2 +-
 taglib.spec | 23 ++++++++++++++---------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6212006..974ebf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-taglib-1.6.3.tar.gz
+/taglib-1.6.3.tar.gz
+/taglib-1.7rc1.tar.gz
diff --git a/sources b/sources
index e215440..2c3fcc7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ddf02f4e1d2dc30f76734df806e613eb  taglib-1.6.3.tar.gz
+57d2cfda8ab71c892cd111566896cad4  taglib-1.7rc1.tar.gz
diff --git a/taglib.spec b/taglib.spec
index 6f88712..e5571f1 100644
--- a/taglib.spec
+++ b/taglib.spec
@@ -10,15 +10,18 @@
 %bcond_without doc
 %global apidocdir __api-doc_fedora
 
+%global pre rc1
+
 Name:       taglib	
-Version:    1.6.3
-Release:    2%{?dist}
+Version:    1.7
+Release:    0.1.%{pre}%{?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
+#URL:        http://developer.kde.org/~wheeler/taglib.html
+URL:        http://launchpad.net/taglib
+Source0:    http://launchpad.net/taglib/trunk/%{version}%{?pre}/+download/taglib-%{version}%{?pre}.tar.gz
 #Source0:    taglib-%{svn}.tar.gz
 # The svn tarball is generated with the following script
 Source1:    taglib-svn.sh
@@ -77,7 +80,7 @@ Files needed when building software with %{name}.
 
 
 %prep
-%setup -q -n taglib-%{version}%{?beta}
+%setup -q -n taglib-%{version}%{?pre}
 
 # patch1 not applied
 ## omit for now
@@ -93,9 +96,8 @@ popd
 make %{?_smp_mflags} -C %{_target_platform}
 
 %if %{with doc}
-cd doc
-doxygen taglib.doxygen
-cd -
+# run doxygen manually, 'make docs' target broken for builddir != srcdir
+doxygen 
 %endif
 
 
@@ -110,7 +112,7 @@ rm -f %{buildroot}%{_libdir}/lib*.la
 
 %if %{with doc}
 rm -fr %{apidocdir} ; mkdir %{apidocdir}
-cp -a doc/html doc/*.png %{apidocdir}
+cp -a doc/html/ doc/*.{css,html,png} %{apidocdir}/
 ln -s html/index.html %{apidocdir}
 find %{apidocdir} -name '*.md5' | xargs rm -fv
 %endif
@@ -157,6 +159,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Feb 19 2011 Rex Dieter <rdieter@fedoraproject.org> - 1.7-0.1.rc1
+- taglib-1.7rc1
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild