rpms/taglib/F-7 taglib-1.5b1-multilib.patch, NONE, 1.1 taglib-1.5rc1-multilib.patch, NONE, 1.1 taglib-svn.sh, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 taglib.spec, 1.14, 1.15

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/taglib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5543

Modified Files:
	.cvsignore sources taglib.spec 
Added Files:
	taglib-1.5b1-multilib.patch taglib-1.5rc1-multilib.patch 
	taglib-svn.sh 
Log Message:
* Wed Feb 20 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5-1
- taglib-1.5


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"

taglib-1.5rc1-multilib.patch:

--- NEW FILE taglib-1.5rc1-multilib.patch ---
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"


--- NEW FILE taglib-svn.sh ---
#!/bin/sh

if [ -d taglib ]; then
    echo "Remove the \"taglib\" directory first !"
    exit 1
fi
svn export svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib
tar -czf taglib-`date +%Y%m%d`.tar.gz taglib
rm -rf taglib


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2005 18:54:16 -0000	1.5
+++ .cvsignore	21 Feb 2008 05:00:54 -0000	1.6
@@ -1 +1 @@
-taglib-1.4.tar.gz
+taglib-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2005 18:54:16 -0000	1.5
+++ sources	21 Feb 2008 05:00:54 -0000	1.6
@@ -1 +1 @@
-dcd50ddb2544faeae77f194804559404  taglib-1.4.tar.gz
+7b557dde7425c6deb7bbedd65b4f2717  taglib-1.5.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/F-7/taglib.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- taglib.spec	18 Dec 2006 22:19:13 -0000	1.14
+++ taglib.spec	21 Feb 2008 05:00:54 -0000	1.15
@@ -1,19 +1,30 @@
+
+# cvsadmin: http://bugzilla.redhat.com/418271
+
 Name:       taglib	
-Version:    1.4
-Release:    5%{?dist}
+Version:    1.5
+Release:    1%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
-License:    LGPL
-URL:	    http://ktown.kde.org/~wheeler/taglib/
-Source:	    http://developer.kde.org/~wheeler/files/src/taglib-1.4.tar.gz
+License:    LGPLv2
+URL:        http://developer.kde.org/~wheeler/taglib.html
+Source0:    http://developer.kde.org/~wheeler/files/src/taglib-%{version}.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)
-Patch0:     http://foetida.jaist.ac.jp:37565/~yaz/diary/2006/07/taglib-1.4_wchar.diff
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+# 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: doxygen, graphviz
+BuildRequires: cmake
+BuildRequires: zlib-devel
 
 %description
 TagLib is a library for reading and editing the meta-data of several
@@ -22,62 +33,102 @@
 FLAC files.
 
 %package devel
-Summary: Development tools for taglib
+Summary: Development files for %{name} 
 Group:	 Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 %description devel
-Development tools for taglib
+%{summary}.
 
 
 %prep
-%setup -q
-%patch0 -p1 -b .wchar
+%setup -q -n taglib-%{version}%{?beta}
 
+## omit for now
+#patch0 -p1 -b .wchar
+%patch2 -p1 -b .multilib
 
-%build
-%configure --disable-rpath
 
-make %{?_smp_mflags}
-# Doc
-pushd taglib-api
-doxygen taglib.doxygen
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} ..
 popd
 
+make %{?_smp_mflags} -C %{_target_platform}
+
+
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
-make install DESTDIR=$RPM_BUILD_ROOT
 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)
-%doc AUTHORS COPYING
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING.LGPL
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc examples
 %{_bindir}/*-config
 %{_includedir}/*
 %{_libdir}/lib*.so
-#%{_libdir}/lib*.la
 %{_libdir}/pkgconfig/*.pc
-%doc taglib-api/html
-%doc examples
 
 
 %changelog
+* Wed Feb 20 2008 Rex Dieter <rdieter at fedoraproject.org> 1.5-1
+- taglib-1.5
+
+* Wed Feb 13 2008 Rex Dieter <rdieter at 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 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)
+
+* Sun Nov 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.6.20071111svn
+- svn20071111 snapshot (#376241)
+
+* Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.5.20070924svn
+- -BR: automake 
+- +BR: zlib-devel
+
+* Thu Sep 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5-0.4.20070924svn
+- use cmake, fixes "taglib_export.h not included" (#272361#c7)
+
+* Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.3.20070924svn
+- rebuild
+
+* Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.2.20070924svn
+- BR: automake
+
+* Mon Sep 24 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.5-0.1.20070924svn
+- update to svn version
+
+* Sun Aug 26 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4-6
+- fix license tag
+- rebuild for BuildID
+
 * Thu Dec 14 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4-5
 - add patch for multi-language support