rpms/taglib/devel taglib-multilib.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 taglib.spec, 1.24, 1.25

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore sources taglib.spec 
Added Files:
	taglib-multilib.patch 
Log Message:
* Wed Jan 16 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.7.20080116svn
- svn20080116 snapshot
- multiarch conflicts (#343241)


taglib-multilib.patch:

--- NEW FILE taglib-multilib.patch ---
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
@@ -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.4
 	  ;;
     --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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 Nov 2007 02:52:34 -0000	1.7
+++ .cvsignore	16 Jan 2008 13:12:22 -0000	1.8
@@ -1,2 +1 @@
-taglib-20070924.tar.gz
-taglib-20071111.tar.gz
+taglib-20080116.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Nov 2007 02:52:34 -0000	1.7
+++ sources	16 Jan 2008 13:12:22 -0000	1.8
@@ -1 +1 @@
-4502d12ccd0a409584ec12981913a775  taglib-20071111.tar.gz
+11cdc80a6ac06bff81c65385c2329f4d  taglib-20080116.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/devel/taglib.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- taglib.spec	2 Jan 2008 13:29:13 -0000	1.24
+++ taglib.spec	16 Jan 2008 13:12:22 -0000	1.25
@@ -1,11 +1,11 @@
 
 # cvsadmin: http://bugzilla.redhat.com/418271
 
-%define svn 20071111
+%define svn 20080116
 
 Name:       taglib	
 Version:    1.5
-Release:    0.6.%{svn}svn%{?dist}
+Release:    0.7.%{svn}svn%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -15,15 +15,14 @@
 # The tarball is generated with the following script
 Source1:    taglib-svn.sh
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:     http://foetida.jaist.ac.jp:37565/~yaz/diary/2006/07/taglib-1.4_wchar.diff
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+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 
 
 BuildRequires: cmake
 BuildRequires: zlib-devel
 
-
 %description
 TagLib is a library for reading and editing the meta-data of several
 popular audio formats. Currently it supports both ID3v1 and ID3v2 for
@@ -41,7 +40,9 @@
 
 %prep
 %setup -q -n taglib
+
 %patch0 -p1 -b .wchar
+%patch1 -p1 -b .multilib
 
 
 %build
@@ -82,11 +83,14 @@
 %{_bindir}/*-config
 %{_includedir}/*
 %{_libdir}/lib*.so
-#%{_libdir}/lib*.la
 %{_libdir}/pkgconfig/*.pc
 
 
 %changelog
+* Wed Jan 16 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.7.20080116svn
+- svn20080116 snapshot
+- multiarch conflicts (#343241)
+
 * Sun Nov 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.6.20071111svn
 - svn20071111 snapshot (#376241)