rpms/libtunepimp/devel libtunepimp-0.5.3-gcc43.patch, 1.2, 1.3 libtunepimp.spec, 1.35, 1.36 tunepimp-0.5.2-configure-disable-plugins.patch, 1.1, NONE

Fri Feb 22 02:50:38 UTC 2008

Author: rdieter

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

Modified Files:
	libtunepimp-0.5.3-gcc43.patch libtunepimp.spec 
Removed Files:
	tunepimp-0.5.2-configure-disable-plugins.patch 
Log Message:
* Thu Feb 21 2008 Rex Dieter <rdieter at fedoraproject.org> 0.5.3-11
- gcc43 patch
- include mp4 plugin here


libtunepimp-0.5.3-gcc43.patch:

Index: libtunepimp-0.5.3-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libtunepimp/devel/libtunepimp-0.5.3-gcc43.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- libtunepimp-0.5.3-gcc43.patch	21 Feb 2008 21:49:20 -0000	1.2
+++ libtunepimp-0.5.3-gcc43.patch	22 Feb 2008 02:50:34 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up libtunepimp-0.5.3/lib/metadata.cpp.gcc43 libtunepimp-0.5.3/lib/metadata.cpp
 --- libtunepimp-0.5.3/lib/metadata.cpp.gcc43	2006-11-18 04:52:33.000000000 -0600
-+++ libtunepimp-0.5.3/lib/metadata.cpp	2008-02-21 15:37:57.000000000 -0600
++++ libtunepimp-0.5.3/lib/metadata.cpp	2008-02-21 20:39:10.000000000 -0600
 @@ -26,6 +26,7 @@
  ----------------------------------------------------------------------------*/
  #include <math.h>
@@ -11,7 +11,7 @@
  using namespace std;
 diff -up libtunepimp-0.5.3/lib/protocol.cpp.gcc43 libtunepimp-0.5.3/lib/protocol.cpp
 --- libtunepimp-0.5.3/lib/protocol.cpp.gcc43	2006-11-28 14:25:04.000000000 -0600
-+++ libtunepimp-0.5.3/lib/protocol.cpp	2008-02-21 15:46:14.000000000 -0600
++++ libtunepimp-0.5.3/lib/protocol.cpp	2008-02-21 20:39:10.000000000 -0600
 @@ -8,6 +8,7 @@
  -------------------------------------------------------------------*/
  #include <stdio.h>
@@ -22,7 +22,7 @@
  #include <expat.h>
 diff -up libtunepimp-0.5.3/lib/utf8/utf8util.cpp.gcc43 libtunepimp-0.5.3/lib/utf8/utf8util.cpp
 --- libtunepimp-0.5.3/lib/utf8/utf8util.cpp.gcc43	2006-11-18 04:52:26.000000000 -0600
-+++ libtunepimp-0.5.3/lib/utf8/utf8util.cpp	2008-02-21 15:30:13.000000000 -0600
++++ libtunepimp-0.5.3/lib/utf8/utf8util.cpp	2008-02-21 20:39:10.000000000 -0600
 @@ -26,6 +26,7 @@
  ----------------------------------------------------------------------------*/
  
@@ -33,7 +33,7 @@
  #ifdef WIN32
 diff -up libtunepimp-0.5.3/lib/tunepimp.cpp.gcc43 libtunepimp-0.5.3/lib/tunepimp.cpp
 --- libtunepimp-0.5.3/lib/tunepimp.cpp.gcc43	2006-11-18 04:52:33.000000000 -0600
-+++ libtunepimp-0.5.3/lib/tunepimp.cpp	2008-02-21 15:36:31.000000000 -0600
++++ libtunepimp-0.5.3/lib/tunepimp.cpp	2008-02-21 20:39:10.000000000 -0600
 @@ -30,7 +30,9 @@
  #endif
  #endif
@@ -45,8 +45,8 @@
  using namespace std;
  
 diff -up libtunepimp-0.5.3/lib/c_wrapper.cpp.gcc43 libtunepimp-0.5.3/lib/c_wrapper.cpp
---- libtunepimp-0.5.3/lib/c_wrapper.cpp.gcc43	2008-02-21 15:43:54.000000000 -0600
-+++ libtunepimp-0.5.3/lib/c_wrapper.cpp	2008-02-21 15:44:11.000000000 -0600
+--- libtunepimp-0.5.3/lib/c_wrapper.cpp.gcc43	2006-11-18 04:52:33.000000000 -0600
++++ libtunepimp-0.5.3/lib/c_wrapper.cpp	2008-02-21 20:39:10.000000000 -0600
 @@ -24,6 +24,7 @@
     $Id$
  
@@ -57,7 +57,7 @@
  #include "tp_c.h"
 diff -up libtunepimp-0.5.3/lib/readmeta.cpp.gcc43 libtunepimp-0.5.3/lib/readmeta.cpp
 --- libtunepimp-0.5.3/lib/readmeta.cpp.gcc43	2006-11-18 04:52:33.000000000 -0600
-+++ libtunepimp-0.5.3/lib/readmeta.cpp	2008-02-21 15:44:47.000000000 -0600
++++ libtunepimp-0.5.3/lib/readmeta.cpp	2008-02-21 20:39:10.000000000 -0600
 @@ -31,6 +31,7 @@
  #endif
  
@@ -66,9 +66,54 @@
  #ifndef WIN32
  #include <unistd.h>
  #endif
+diff -up libtunepimp-0.5.3/lib/fileio.cpp.gcc43 libtunepimp-0.5.3/lib/fileio.cpp
+--- libtunepimp-0.5.3/lib/fileio.cpp.gcc43	2006-11-18 04:52:33.000000000 -0600
++++ libtunepimp-0.5.3/lib/fileio.cpp	2008-02-21 20:39:10.000000000 -0600
+@@ -27,6 +27,8 @@
+ 
+ #include <assert.h>
+ #include <errno.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <string>
+ #ifndef WIN32
+ #include <unistd.h>
+diff -up libtunepimp-0.5.3/plugins/mp4/mp4.cpp.gcc43 libtunepimp-0.5.3/plugins/mp4/mp4.cpp
+--- libtunepimp-0.5.3/plugins/mp4/mp4.cpp.gcc43	2006-11-18 04:51:08.000000000 -0600
++++ libtunepimp-0.5.3/plugins/mp4/mp4.cpp	2008-02-21 20:39:10.000000000 -0600
+@@ -27,6 +27,7 @@
+ 
+ #include <string.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <mp4.h>
+ #include "metadata.h"
+ #include "plugin.h"
+diff -up libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp.gcc43 libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp
+--- libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp.gcc43	2006-11-18 04:51:07.000000000 -0600
++++ libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp	2008-02-21 20:41:35.000000000 -0600
+@@ -26,6 +26,7 @@
+ ----------------------------------------------------------------------------*/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <time.h>
+ #include <ctype.h>
+ #include <musicbrainz/mb_c.h>
+diff -up libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp.gcc43 libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp
+--- libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp.gcc43	2006-11-18 04:51:07.000000000 -0600
++++ libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp	2008-02-21 20:41:59.000000000 -0600
+@@ -26,6 +26,7 @@
+ ----------------------------------------------------------------------------*/
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <assert.h>
+ #include <ctype.h>
+ #include <musicbrainz/mb_c.h>
 diff -up libtunepimp-0.5.3/plugins/wma/wma.cpp.gcc43 libtunepimp-0.5.3/plugins/wma/wma.cpp
 --- libtunepimp-0.5.3/plugins/wma/wma.cpp.gcc43	2006-11-18 04:51:28.000000000 -0600
-+++ libtunepimp-0.5.3/plugins/wma/wma.cpp	2008-02-21 15:46:51.000000000 -0600
++++ libtunepimp-0.5.3/plugins/wma/wma.cpp	2008-02-21 20:39:10.000000000 -0600
 @@ -27,6 +27,7 @@
  
  #include <string.h>
@@ -79,7 +124,7 @@
  #include "plugin.h"
 diff -up libtunepimp-0.5.3/plugins/wma/wmafile.cpp.gcc43 libtunepimp-0.5.3/plugins/wma/wmafile.cpp
 --- libtunepimp-0.5.3/plugins/wma/wmafile.cpp.gcc43	2006-11-18 04:51:28.000000000 -0600
-+++ libtunepimp-0.5.3/plugins/wma/wmafile.cpp	2008-02-21 15:47:14.000000000 -0600
++++ libtunepimp-0.5.3/plugins/wma/wmafile.cpp	2008-02-21 20:39:10.000000000 -0600
 @@ -19,6 +19,7 @@
   *   USA                                                                   *
   ***************************************************************************/
@@ -90,7 +135,7 @@
  #include <wmatag.h>
 diff -up libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h.gcc43 libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h
 --- libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h.gcc43	2006-11-18 04:52:08.000000000 -0600
-+++ libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h	2008-02-21 15:37:11.000000000 -0600
++++ libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h	2008-02-21 20:39:10.000000000 -0600
 @@ -27,6 +27,7 @@
  #ifndef __METADATA_H__
  #define __METADATA_H__


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtunepimp/devel/libtunepimp.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- libtunepimp.spec	21 Feb 2008 18:32:20 -0000	1.35
+++ libtunepimp.spec	22 Feb 2008 02:50:34 -0000	1.36
@@ -1,4 +1,8 @@
 
+%if 0%{?fedora} > 4
+%define _with_mp4 1
+%endif
+
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
 Version: 0.5.3
@@ -15,7 +19,9 @@
 
 %define pkglibdir %{_libdir}/tunepimp
 
+BuildRequires: automake libtool
 BuildRequires: flac-devel
+%{?_with_mp4:BuildRequires: libmp4v2-devel}
 BuildRequires: libmpcdec-devel
 BuildRequires: libmusicbrainz-devel >= 2.1.0
 BuildRequires: libofa-devel curl-devel expat-devel
@@ -25,6 +31,10 @@
 BuildRequires: taglib-devel 
 BuildRequires: zlib-devel
 
+%if 0%{?_with_mp4:1}
+Provides:  libtunepimp-mp4 = %{version}-%{release}
+%endif
+
 Obsoletes: libtunepimp-tools < %{version}-%{release}
 Provides:  libtunepimp-tools = %{version}-%{release}
 
@@ -49,14 +59,11 @@
 %description devel
 %{summary}.
 
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib:%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %package -n python-tunepimp
 Summary: Python bindings for developing programs that will use %{name} 
 Group:   Development/Libraries
 %define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
-%if "%{?python_ver}" > "2"
-Requires: python-abi = %{python_ver}
-%endif
 %description -n python-tunepimp
 %{summary}.
 
@@ -66,6 +73,9 @@
 
 %patch1 -p1 -b .gcc43
 
+# nuke rpath
+autoreconf
+
 
 %build
 %configure \
@@ -91,6 +101,7 @@
 
 # unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{!?_with_mp4:rm -f  $RPM_BUILD_ROOT%{pkglibdir}/plugins/mp4.tpp}
 
 
 %clean
@@ -112,6 +123,7 @@
 %dir %{pkglibdir}/
 %dir %{pkglibdir}/plugins/
 %{pkglibdir}/plugins/flac.tpp
+%{?_with_mp4:%{pkglibdir}/plugins/mp4.tpp}
 %{pkglibdir}/plugins/mpc.tpp
 %{pkglibdir}/plugins/speex.tpp
 %{pkglibdir}/plugins/vorbis.tpp
@@ -128,12 +140,13 @@
 %files -n python-tunepimp
 %defattr(-,root,root,-)
 %doc python/examples/trm.py
-%{python_sitelib}/tunepimp/
+%{python_sitelib}/tunepimp*
 
 
 %changelog
 * Thu Feb 21 2008 Rex Dieter <rdieter at fedoraproject.org> 0.5.3-11
 - gcc43 patch
+- include mp4 plugin here
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.3-10
 - Autorebuild for GCC 4.3


--- tunepimp-0.5.2-configure-disable-plugins.patch DELETED ---


