diff --git a/.cvsignore b/.cvsignore index 2cd612e..2f5e79e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -taglib-20070924.tar.gz -taglib-20071111.tar.gz +taglib-20080116.tar.gz diff --git a/sources b/sources index 1cc4657..97bd469 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4502d12ccd0a409584ec12981913a775 taglib-20071111.tar.gz +11cdc80a6ac06bff81c65385c2329f4d taglib-20080116.tar.gz diff --git a/taglib-multilib.patch b/taglib-multilib.patch new file mode 100644 index 0000000..ab42960 --- /dev/null +++ b/taglib-multilib.patch @@ -0,0 +1,38 @@ +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" diff --git a/taglib.spec b/taglib.spec index c5114a9..51bfac9 100644 --- a/taglib.spec +++ b/taglib.spec @@ -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 @@ Source0: taglib-%{svn}.tar.gz # 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 @@ Requires: pkgconfig %prep %setup -q -n taglib + %patch0 -p1 -b .wchar +%patch1 -p1 -b .multilib %build @@ -82,11 +83,14 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/*-config %{_includedir}/* %{_libdir}/lib*.so -#%{_libdir}/lib*.la %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jan 16 2008 Rex Dieter 1.5-0.7.20080116svn +- svn20080116 snapshot +- multiarch conflicts (#343241) + * Sun Nov 11 2007 Rex Dieter 1.5-0.6.20071111svn - svn20071111 snapshot (#376241)