From 95bfa3faf47b50781b113969c4c358dd3003dd8a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Mon, 4 Feb 2008 15:16:57 +0000
Subject: [PATCH] - taglib-1.5b1

---
 .cvsignore                                    |  1 +
 sources                                       |  2 +-
 ...tilib.patch => taglib-1.5b1-multilib.patch | 15 ++++++++-------
 taglib.spec                                   | 19 +++++++++++++------
 4 files changed, 23 insertions(+), 14 deletions(-)
 rename taglib-multilib.patch => taglib-1.5b1-multilib.patch (63%)

diff --git a/.cvsignore b/.cvsignore
index 2f5e79e..7df86fa 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 taglib-20080116.tar.gz
+taglib-1.5b1.tar.gz
diff --git a/sources b/sources
index 97bd469..b686f25 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-11cdc80a6ac06bff81c65385c2329f4d  taglib-20080116.tar.gz
+d8564b9fac72490ef02a2d12f4d4e664  taglib-1.5b1.tar.gz
diff --git a/taglib-multilib.patch b/taglib-1.5b1-multilib.patch
similarity index 63%
rename from taglib-multilib.patch
rename to taglib-1.5b1-multilib.patch
index ab42960..8be6bb5 100644
--- a/taglib-multilib.patch
+++ b/taglib-1.5b1-multilib.patch
@@ -1,6 +1,6 @@
-diff -up taglib/taglib-config.cmake.multilib taglib/taglib-config.cmake
---- taglib/taglib-config.cmake.multilib	2006-09-20 07:52:28.000000000 -0500
-+++ taglib/taglib-config.cmake	2008-01-16 07:08:42.000000000 -0600
+diff -up taglib-1.5b1/taglib-config.cmake.multilib taglib-1.5b1/taglib-config.cmake
+--- taglib-1.5b1/taglib-config.cmake.multilib	2008-01-29 19:30:00.000000000 -0600
++++ taglib-1.5b1/taglib-config.cmake	2008-02-04 08:37:38.000000000 -0600
 @@ -14,10 +14,10 @@ EOH
  	exit 1;
  }
@@ -21,18 +21,19 @@ diff -up taglib/taglib-config.cmake.multilib taglib/taglib-config.cmake
    case $1 in
      --libs)
 -	  flags="$flags -L$libdir -ltag"
-+	  flags="$flags $taglib_libs"
++	  flags="$flags ${taglib_libs}"
  	  ;;
      --cflags)
 -	  flags="$flags -I$includedir/taglib"
-+	  flags="$flags $taglib_cflags"
++	  flags="$flags ${taglib_cflags}"
  	  ;;
      --version)
- 	  echo 1.4
+-	  echo 1.5
++	  echo ${taglib_version} 
  	  ;;
      --prefix)
 -	  echo $prefix
-+	  echo $taglib_prefix
++	  echo ${taglib_prefix} 
  	  ;;
  	*)
  	  echo "$0: unknown option $1"
diff --git a/taglib.spec b/taglib.spec
index 51bfac9..0466b44 100644
--- a/taglib.spec
+++ b/taglib.spec
@@ -1,24 +1,28 @@
 
 # cvsadmin: http://bugzilla.redhat.com/418271
 
-%define svn 20080116
+#define svn 20080116
+#define beta %{svn}svn
+%define beta b1
 
 Name:       taglib	
 Version:    1.5
-Release:    0.7.%{svn}svn%{?dist}
+Release:    0.8.%{?beta}%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
 License:    LGPLv2
 URL:	    http://ktown.kde.org/~wheeler/taglib/
-Source0:    taglib-%{svn}.tar.gz
-# The tarball is generated with the following script
+Source0:    http://developer.kde.org/~wheeler/files/src/taglib-1.5b1.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)
 
+# what is this for?  why not upstreamed, yet?  -- Rex
 Patch0:     http://foetida.jaist.ac.jp:37565/~yaz/diary/2006/07/taglib-1.4_wchar.diff
 # http://bugzilla.redhat.com/343241
-Patch1:     taglib-multilib.patch 
+Patch1:     taglib-1.5b1-multilib.patch 
 
 BuildRequires: cmake
 BuildRequires: zlib-devel
@@ -39,7 +43,7 @@ Requires: pkgconfig
 
 
 %prep
-%setup -q -n taglib
+%setup -q -n taglib-%{version}%{?beta}
 
 %patch0 -p1 -b .wchar
 %patch1 -p1 -b .multilib
@@ -87,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb 04 2008 Rex Dieter <rdieter@fedoraproject.org> 1.5-0.8.b1
+- taglib-1.5b1
+
 * Wed Jan 16 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.7.20080116svn
 - svn20080116 snapshot
 - multiarch conflicts (#343241)