rpms/taglib/EL-4 taglib-1.4_wchar.diff, NONE, 1.1 taglib-1.5b1-multilib.patch, NONE, 1.1 taglib-1.5rc1-multilib.patch, NONE, 1.1 taglib-svn.sh, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 taglib.spec, 1.6, 1.7

Mon Apr 14 16:51:46 UTC 2008

Author: rdieter

Update of /cvs/pkgs/rpms/taglib/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2519

Modified Files:
	.cvsignore sources taglib.spec 
Added Files:
	taglib-1.4_wchar.diff 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.4_wchar.diff:

--- NEW FILE taglib-1.4_wchar.diff ---
diff -ruN taglib-1.4.org/taglib/toolkit/tstring.cpp taglib-1.4/taglib/toolkit/tstring.cpp
--- taglib-1.4.org/taglib/toolkit/tstring.cpp	2005-07-26 06:31:15.000000000 +0900
+++ taglib-1.4/taglib/toolkit/tstring.cpp	2006-05-26 12:02:55.000000000 +0900
@@ -202,12 +202,22 @@
   s.resize(d->data.size());
 
   if(!unicode) {
-    std::string::iterator targetIt = s.begin();
-    for(wstring::const_iterator it = d->data.begin(); it != d->data.end(); it++) {
-      *targetIt = char(*it);
-      ++targetIt;
+    bool cjk = false;
+    //pre-scan: is there any cjk unicode character? if so, convert the string into utf-8.
+    for(unsigned int i=0; i< d->data.size(); i++){
+      if(d->data[i] > 0xff){
+        cjk = true;
+        break;
+      }
+    }
+    if(!cjk){
+      std::string::iterator targetIt = s.begin();
+      for(wstring::const_iterator it = d->data.begin(); it != d->data.end(); it++) {
+        *targetIt = char(*it);
+        ++targetIt;
+      }
+      return s;
     }
-    return s;
   }
 
   const int outputBufferSize = d->data.size() * 3 + 1;

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/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jan 2005 19:13:31 -0000	1.4
+++ .cvsignore	14 Apr 2008 16:51:03 -0000	1.5
@@ -1 +1 @@
-taglib-1.3.1.tar.gz
+taglib-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Jan 2005 19:13:31 -0000	1.4
+++ sources	14 Apr 2008 16:51:03 -0000	1.5
@@ -1 +1 @@
-f5c7c71513ba51b240864d7475a199c0  taglib-1.3.1.tar.gz
+7b557dde7425c6deb7bbedd65b4f2717  taglib-1.5.tar.gz


Index: taglib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/taglib/EL-4/taglib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- taglib.spec	18 Jan 2005 19:13:31 -0000	1.6
+++ taglib.spec	14 Apr 2008 16:51:03 -0000	1.7
@@ -1,80 +1,152 @@
+
+# cvsadmin: http://bugzilla.redhat.com/418271
+
 Name:       taglib	
-Version:    1.3.1
-Release:    1
-Epoch:      0 
-Summary:    Audio Meta-Data Library 
+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.3.1.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)
 
-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 
-popular audio formats. Currently it supports both ID3v1 and ID3v2 for 
-MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in 
+TagLib is a library for reading and editing the meta-data of several
+popular audio formats. Currently it supports both ID3v1 and ID3v2 for
+MP3 files, Ogg Vorbis comments and ID3 tags and Vorbis comments in
 FLAC files.
 
 %package devel
-Summary: Development tools for taglib 
+Summary: Development files for %{name} 
 Group:	 Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 %description devel
-Development tools for taglib
+%{summary}.
 
 
 %prep
-%setup -q
+%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 %{buildroot}
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS COPYING README
+%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
-%doc taglib-api/html
-%doc examples
+%{_libdir}/pkgconfig/*.pc
 
 
-%clean 
-rm -rf $RPM_BUILD_ROOT
+%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)
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+* 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
+
+* Thu Sep 14 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4-4
+- have the devel package require pkgconfig (#206443)
+
+* Thu Aug 31 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.4-3
+- rebuild
+
+* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-2
+- rebuild for FC5
+
+* Mon Aug 01 2005 Aurelien Bompard <gauret[AT]free.fr> 1.4-1
+- version 1.4
+
+* Fri Mar 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.3.1-2
+- rebuild with g++4
 
-%changelog
 * Mon Jan 10 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.3.1-1
 - version 1.3.1
 - drop patch0
@@ -117,4 +189,4 @@
 - fix for rh73
 
 * Fri Feb 06 2004 Rex Dieter <rexdieter at sf.net> 0:1.0-0.fdr.0
-- first try 
+- first try


