rpms/libtunepimp/F-7 libtunepimp-0.5.3-gcc43.patch, NONE, 1.1 libtunepimp.spec, 1.27, 1.28 tunepimp-0.5.2-configure-disable-plugins.patch, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Fri Feb 22 03:51:51 UTC 2008 

Author: rdieter

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

Modified Files:
	libtunepimp.spec 
Added Files:
	libtunepimp-0.5.3-gcc43.patch 
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:

--- NEW FILE libtunepimp-0.5.3-gcc43.patch ---
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 20:39:10.000000000 -0600
@@ -26,6 +26,7 @@
 ----------------------------------------------------------------------------*/
 #include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include "metadata.h"
 #include "../config.h"
 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 20:39:10.000000000 -0600
@@ -8,6 +8,7 @@
 -------------------------------------------------------------------*/
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <string>
 #include <map>
 #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 20:39:10.000000000 -0600
@@ -26,6 +26,7 @@
 ----------------------------------------------------------------------------*/
 
 #include <stdio.h>
+#include <stdlib.h>
 #include "utf8util.h"
 #include "utf8.h"
 #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 20:39:10.000000000 -0600
@@ -30,7 +30,9 @@
 #endif
 #endif
 
+#include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <map>
 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	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: c_wrapper.cpp 8360 2006-08-07 21:05:12Z luks $
 
 ----------------------------------------------------------------------------*/
+#include <stdlib.h>
 #include "tunepimp.h"
 #include "mutex.h"
 #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 20:39:10.000000000 -0600
@@ -31,6 +31,7 @@
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #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 20:39:10.000000000 -0600
@@ -27,6 +27,7 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <wmafile.h>
 #include "metadata.h"
 #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 20:39:10.000000000 -0600
@@ -19,6 +19,7 @@
  *   USA                                                                   *
  ***************************************************************************/
 
+#include <string.h>
 #include <tstring.h>
 #include <wmafile.h>
 #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 20:39:10.000000000 -0600
@@ -27,6 +27,7 @@
 #ifndef __METADATA_H__
 #define __METADATA_H__
 
+#include <string.h>
 #include <string>
 #include <cstdio>
 


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtunepimp/F-7/libtunepimp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- libtunepimp.spec	14 Feb 2007 19:59:57 -0000	1.27
+++ libtunepimp.spec	22 Feb 2008 03:51:17 -0000	1.28
@@ -1,32 +1,39 @@
 
+%if 0%{?fedora} > 4
+%define _with_mp4 1
+%endif
+
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
 Version: 0.5.3
-Release: 3%{?dist}
+Release: 11%{?dist}
 
-License: LGPL
+License: LGPLv2+
 Group: 	 System Environment/Libraries
-URL:	 http://www.musicbrainz.org/products/tunepimp/
+URL:	 http://musicbrainz.org/doc/libtunepimp
 # see http://musicbrainz.org/doc/libtunepimpDownload
 Source0: http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: libtunepimp-0.5.3-gcc43.patch
+
 %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: readline-devel ncurses-devel
+BuildRequires: libofa-devel curl-devel expat-devel
 BuildRequires: libvorbis-devel
-BuildRequires: flac-devel
-BuildRequires: zlib-devel
-BuildRequires: taglib-devel
+BuildRequires: python-devel
 BuildRequires: readline-devel ncurses-devel
-BuildRequires: libmpcdec-devel
-
-BuildRequires: libofa-devel
-BuildRequires: curl-devel
-BuildRequires: expat-devel
+BuildRequires: taglib-devel 
+BuildRequires: zlib-devel
 
-BuildRequires: python-devel
+%if 0%{?_with_mp4:1}
+Provides:  libtunepimp-mp4 = %{version}-%{release}
+%endif
 
 Obsoletes: libtunepimp-tools < %{version}-%{release}
 Provides:  libtunepimp-tools = %{version}-%{release}
@@ -52,15 +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
-License: GPL
 %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}.
 
@@ -68,6 +71,11 @@
 %prep
 %setup -q -n libtunepimp-%{version}
 
+%patch1 -p1 -b .gcc43
+
+# nuke rpath
+autoreconf
+
 
 %build
 %configure \
@@ -93,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
@@ -114,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
@@ -130,10 +140,35 @@
 %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
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.5.3-9
+- respin (BuildID)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.5.3-8
+- License: LGPLv2+
+
+* Fri Jun 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.5.3-7
+- fix URL (#245283)
+
+* Wed Jun 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.5.3-6
+- go back to unversioned BR: libmpcdec-devel
+
+* Wed Jun 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.5.3-5
+- respin (again for libmpcdec), BR: libmpcdec-devel >= 1.2.6 (#244228)
+
+* Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.5.3-4
+- respin (for libmpcdec)
+
 * Wed Feb 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.5.3-3
 - respin (for flac)
 


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

More information about the fedora-extras-commits mailing list