From bc0aab1033aaf81525b6bbf2460ef7c7f08b5db8 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Wed, 13 Feb 2008 12:45:45 +0000
Subject: [PATCH] - taglib-1.5rc1 - omit taglib-1.4_wchar.diff (for now)

---
 .cvsignore                   |  3 +--
 sources                      |  2 +-
 taglib-1.5rc1-multilib.patch | 20 ++++++++++++++++++++
 taglib.spec                  | 35 ++++++++++++++++++++++-------------
 4 files changed, 44 insertions(+), 16 deletions(-)
 create mode 100644 taglib-1.5rc1-multilib.patch

diff --git a/.cvsignore b/.cvsignore
index 7df86fa..3f0af0e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-taglib-20080116.tar.gz
-taglib-1.5b1.tar.gz
+taglib-1.5rc1.tar.gz
diff --git a/sources b/sources
index b686f25..66a94aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8564b9fac72490ef02a2d12f4d4e664  taglib-1.5b1.tar.gz
+04c8d35177263d802cbae493cb8b1c83  taglib-1.5rc1.tar.gz
diff --git a/taglib-1.5rc1-multilib.patch b/taglib-1.5rc1-multilib.patch
new file mode 100644
index 0000000..4f0cb40
--- /dev/null
+++ b/taglib-1.5rc1-multilib.patch
@@ -0,0 +1,20 @@
+diff -up taglib-1.5rc1/taglib-config.cmake.multilib-2 taglib-1.5rc1/taglib-config.cmake
+--- taglib-1.5rc1/taglib-config.cmake.multilib-2	2008-01-29 19:30:00.000000000 -0600
++++ taglib-1.5rc1/taglib-config.cmake	2008-02-13 06:41:11.000000000 -0600
+@@ -16,7 +16,6 @@ EOH
+ 
+ prefix=${CMAKE_INSTALL_PREFIX}
+ exec_prefix=${CMAKE_INSTALL_PREFIX}
+-libdir=${LIB_INSTALL_DIR}
+ includedir=${INCLUDE_INSTALL_DIR}
+ 
+ flags=""
+@@ -29,7 +28,7 @@ while test $# -gt 0
+ do
+   case $1 in
+     --libs)
+-	  flags="$flags -L$libdir -ltag"
++	  flags="$flags -ltag"
+ 	  ;;
+     --cflags)
+ 	  flags="$flags -I$includedir/taglib"
diff --git a/taglib.spec b/taglib.spec
index 0466b44..60f6958 100644
--- a/taglib.spec
+++ b/taglib.spec
@@ -3,26 +3,29 @@
 
 #define svn 20080116
 #define beta %{svn}svn
-%define beta b1
+%define beta rc1 
 
 Name:       taglib	
 Version:    1.5
-Release:    0.8.%{?beta}%{?dist}
+Release:    0.9.%{?beta}%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
 License:    LGPLv2
 URL:	    http://ktown.kde.org/~wheeler/taglib/
-Source0:    http://developer.kde.org/~wheeler/files/src/taglib-1.5b1.tar.gz
+Source0:    http://developer.kde.org/~wheeler/files/src/taglib-1.5rc1.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
+# what is this for?  why not upstreamed, yet?  Aurelien? -- Rex
 Patch0:     http://foetida.jaist.ac.jp:37565/~yaz/diary/2006/07/taglib-1.4_wchar.diff
 # http://bugzilla.redhat.com/343241
+# try 1, use pkg-config
 Patch1:     taglib-1.5b1-multilib.patch 
+# try 2, kiss omit -L%_libdir
+Patch2:     taglib-1.5rc1-multilib.patch
 
 BuildRequires: cmake
 BuildRequires: zlib-devel
@@ -34,7 +37,7 @@ MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in
 FLAC files.
 
 %package devel
-Summary: Development tools for %{name} 
+Summary: Development file for %{name} 
 Group:	 Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
@@ -45,8 +48,9 @@ Requires: pkgconfig
 %prep
 %setup -q -n taglib-%{version}%{?beta}
 
-%patch0 -p1 -b .wchar
-%patch1 -p1 -b .multilib
+## omit for now
+#patch0 -p1 -b .wchar
+%patch2 -p1 -b .multilib
 
 
 %build
@@ -59,30 +63,31 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 rm -fr examples/.deps
 rm -fr examples/Makefile*
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_libdir}/lib*.la
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING.LGPL
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc examples
 %{_bindir}/*-config
 %{_includedir}/*
@@ -91,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 13 2008 Rex Dieter <rdieter@fedoraproject.org> 1.5-0.9.rc1
+- taglib-1.5rc1
+- omit taglib-1.4_wchar.diff (for now)
+
 * Mon Feb 04 2008 Rex Dieter <rdieter@fedoraproject.org> 1.5-0.8.b1
 - taglib-1.5b1