rpms/taglib/devel taglib-1.5b1-multilib.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 taglib.spec, 1.25, 1.26 taglib-multilib.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/taglib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24596

Modified Files:
	.cvsignore sources taglib.spec 
Added Files:
	taglib-1.5b1-multilib.patch 
Removed Files:
	taglib-multilib.patch 
Log Message:
* Mon Feb 04 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5-0.8.b1
- taglib-1.5b1


taglib-1.5b1-multilib.patch:

--- NEW FILE taglib-1.5b1-multilib.patch ---
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;
 }
 
-prefix=${CMAKE_INSTALL_PREFIX}
-exec_prefix=${CMAKE_INSTALL_PREFIX}
-libdir=${LIB_INSTALL_DIR}
-includedir=${INCLUDE_INSTALL_DIR}
+taglib_prefix="`pkg-config --variable=prefix taglib`"
+taglib_cflags="`pkg-config --cflags taglib`"
+taglib_libs="`pkg-config --libs taglib`"
+taglib_version="`pkg-config --modversion taglib`"
 
 flags=""
 
@@ -29,16 +29,16 @@ while test $# -gt 0
 do
   case $1 in
     --libs)
-	  flags="$flags -L$libdir -ltag"
+	  flags="$flags ${taglib_libs}"
 	  ;;
     --cflags)
-	  flags="$flags -I$includedir/taglib"
+	  flags="$flags ${taglib_cflags}"
 	  ;;
     --version)
-	  echo 1.5
+	  echo ${taglib_version} 
 	  ;;
     --prefix)
-	  echo $prefix
+	  echo ${taglib_prefix} 
 	  ;;
 	*)
 	  echo "$0: unknown option $1"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	16 Jan 2008 13:12:22 -0000	1.8
+++ .cvsignore	4 Feb 2008 15:16:57 -0000	1.9
@@ -1 +1,2 @@
 taglib-20080116.tar.gz
+taglib-1.5b1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	16 Jan 2008 13:12:22 -0000	1.8
+++ sources	4 Feb 2008 15:16:57 -0000	1.9
@@ -1 +1 @@
-11cdc80a6ac06bff81c65385c2329f4d  taglib-20080116.tar.gz
+d8564b9fac72490ef02a2d12f4d4e664  taglib-1.5b1.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- taglib.spec	16 Jan 2008 13:12:22 -0000	1.25
+++ taglib.spec	4 Feb 2008 15:16:57 -0000	1.26
@@ -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 @@
 
 
 %prep
-%setup -q -n taglib
+%setup -q -n taglib-%{version}%{?beta}
 
 %patch0 -p1 -b .wchar
 %patch1 -p1 -b .multilib
@@ -87,6 +91,9 @@
 
 
 %changelog
+* Mon Feb 04 2008 Rex Dieter <rdieter at 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)


--- taglib-multilib.patch DELETED ---