rpms/libtunepimp/EL-5 libtunepimp-0.5.3-gcc43.patch, NONE, 1.1 libtunepimp.spec, 1.24, 1.25 tunepimp-0.5.2-configure-disable-plugins.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Fri Dec 5 17:10:00 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/libtunepimp/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19946
Modified Files:
libtunepimp.spec
Added Files:
libtunepimp-0.5.3-gcc43.patch
Removed Files:
tunepimp-0.5.2-configure-disable-plugins.patch
Log Message:
devel/ branch sync, rpath fixes mostly
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/EL-5/libtunepimp.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libtunepimp.spec 7 Nov 2007 00:56:50 -0000 1.24
+++ libtunepimp.spec 5 Dec 2008 17:09:29 -0000 1.25
@@ -1,8 +1,12 @@
+%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: 9%{?dist}
+Release: 13%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -11,9 +15,19 @@
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
+%if 0%{?fedora} > 10
+# libtool2 (libltdl) building busted
+%else
+%define use_autofoo 1
+BuildRequires: automake libtool libtool-ltdl-devel
+%endif
+BuildRequires: chrpath
BuildRequires: flac-devel
+%{?_with_mp4:BuildRequires: libmp4v2-devel}
BuildRequires: libmpcdec-devel
BuildRequires: libmusicbrainz-devel >= 2.1.0
BuildRequires: libofa-devel curl-devel expat-devel
@@ -23,6 +37,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}
@@ -47,14 +65,12 @@
%description devel
%{summary}.
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
+%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
%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}.
@@ -62,6 +78,18 @@
%prep
%setup -q -n libtunepimp-%{version}
+%patch1 -p1 -b .gcc43
+
+# nuke rpath -- Rex
+%if 0%{?use_autofoo}
+autoreconf -i -f
+%else
+# ugly non-autofoo-but-works-with-libtool2 solution
+%if "%{_libdir}" != "/usr/lib"
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
+%endif
+%endif
+
%build
%configure \
@@ -77,20 +105,28 @@
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT PLUGIN_DIR=%{pkglibdir}/plugins
+make install DESTDIR=%{buildroot} PLUGIN_DIR=%{pkglibdir}/plugins
pushd python
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
popd
+for foo in \
+ %{buildroot}%{_bindir}/puid \
+ %{buildroot}%{_libdir}/libtunepimp.so \
+ %{buildroot}%{pkglibdir}/plugins/*.tpp ; do
+ chrpath --list $foo && chrpath --delete $foo
+done
+
# unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_libdir}/lib*.la
+%{!?_with_mp4:rm -f %{buildroot}%{pkglibdir}/plugins/mp4.tpp}
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post -p /sbin/ldconfig
@@ -104,10 +140,11 @@
# README omitted, it's mostly useless
%doc README.LGPL
%{_bindir}/puid
-%{_libdir}/lib*.so.*
+%{_libdir}/libtunepimp.so.5*
%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
@@ -119,15 +156,28 @@
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
-%{_libdir}/lib*.so
+%{_libdir}/libtunepimp.so
%files -n python-tunepimp
%defattr(-,root,root,-)
%doc python/examples/trm.py
-%{python_sitelib}/tunepimp/
+%{python_sitelib}/tunepimp*
%changelog
+* Fri Dec 05 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.5.3-13
+- fix build (libtool(2) and more rpath fun)
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.5.3-12
+- Rebuild for Python 2.6
+
+* 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)
--- tunepimp-0.5.2-configure-disable-plugins.patch DELETED ---
More information about the fedora-extras-commits
mailing list