[taglib] taglib-1.7.1

[Rex Dieter]

commit 0506572cc44fec52af95cde93a3b0350db75f672
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Mar 19 12:17:19 2012 -0500

    taglib-1.7.1

 .gitignore  |    3 +--
 sources     |    2 +-
 taglib.spec |   27 ++++++++++++++-------------
 3 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e66f587..6aab08f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/taglib-1.6.3.tar.gz
-/taglib-1.7.tar.gz
+/taglib-1.7.1.tar.gz
diff --git a/sources b/sources
index 3f77ad1..ed6a196 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a7e312668f153fa905a81714aebc257  taglib-1.7.tar.gz
+aa0f7e2d9700bbb78c5f990ed2f5d9b6  taglib-1.7.1.tar.gz
diff --git a/taglib.spec b/taglib.spec
index c37c7de..228c27e 100644
--- a/taglib.spec
+++ b/taglib.spec
@@ -11,16 +11,17 @@
 %global apidocdir __api-doc_fedora
 
 Name:       taglib	
-Version:    1.7
-Release:    4%{?dist}
+Version:    1.7.1
+Release:    1%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
 License:    LGPLv2
-#URL:        http://developer.kde.org/~wheeler/taglib.html
+#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
+Source0:    https://github.com/downloads/taglib/taglib/taglib-1.7.1.tar.gz
+#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
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -99,8 +100,7 @@ popd
 make %{?_smp_mflags} -C %{_target_platform}
 
 %if %{with doc}
-# run doxygen manually, 'make docs' target broken for builddir != srcdir
-doxygen 
+make docs -C %{_target_platform}
 %endif
 
 
@@ -109,13 +109,14 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+# unpackaged files
 rm -fr examples/.deps
 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/*.{css,html,png} %{apidocdir}/
+cp -a %{_target_platform}/doc/html/ %{apidocdir}/
 ln -s html/index.html %{apidocdir}
 find %{apidocdir} -name '*.md5' | xargs rm -fv
 %endif
@@ -123,9 +124,8 @@ find %{apidocdir} -name '*.md5' | xargs rm -fv
 
 %if %{with tests}
 %check
-cp -a tests/data %{_target_platform}/tests
-cd %{_target_platform}
-LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make check
+ln -s ../../tests/data %{_target_platform}/tests/
+LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make check -C %{_target_platform}
 %endif
 
 
@@ -134,10 +134,8 @@ rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LGPL NEWS
@@ -162,6 +160,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Mar 19 2012 Rex Dieter <rdieter at fedoraproject.org> 1.7.1-1
+- taglib-1.7.1
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-4
 - Rebuilt for c++ ABI breakage