Author: rdieter Update of /cvs/free/rpms/libtunepimp-extras-freeworld/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv1045 Modified Files: libtunepimp-extras-freeworld.spec Added Files: libtunepimp-0.5.3-glibc210_strrchr.patch Log Message: * Fri Apr 03 2009 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 0.5.3-7 - fix build (port fedora/rawhide build fixes) libtunepimp-0.5.3-glibc210_strrchr.patch: --- NEW FILE libtunepimp-0.5.3-glibc210_strrchr.patch --- diff -up libtunepimp-0.5.3/lib/fileio.cpp.gcc44 libtunepimp-0.5.3/lib/fileio.cpp --- libtunepimp-0.5.3/lib/fileio.cpp.gcc44 2006-11-18 04:52:33.000000000 -0600 +++ libtunepimp-0.5.3/lib/fileio.cpp 2009-03-06 13:33:44.000000000 -0600 @@ -122,7 +124,8 @@ int taccess(const char *pathname, int mo void tmktempname(const char *path, char *newPath, int newPathLen) { - char *ptr, *temp; + const char *ptr; + char *temp; temp = (char *)malloc(strlen(path) + 32); ptr = strrchr(path, dirSepChar); Index: libtunepimp-extras-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/libtunepimp-extras-freeworld/devel/libtunepimp-extras-freeworld.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libtunepimp-extras-freeworld.spec 29 Mar 2009 13:28:39 -0000 1.6 +++ libtunepimp-extras-freeworld.spec 3 Apr 2009 20:00:58 -0000 1.7 @@ -2,7 +2,7 @@ Summary: Additional plugins for libtunepimp Name: libtunepimp-extras-freeworld Version: 0.5.3 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -16,11 +16,19 @@ Obsoletes: libtunepimp-extras-nonfree < 0.5.3-5 Patch1: libtunepimp-0.5.3-gcc43.patch -Patch2: libtunepimp-0.5.3-libmad.patch +Patch2: libtunepimp-0.5.3-glibc210_strrchr.patch + +Patch10: libtunepimp-0.5.3-libmad.patch %define pkglibdir %{_libdir}/tunepimp -BuildRequires: automake libtool +%if 0%{?fedora} > 10 +# libtool2 (libltdl) building busted +%else +%define use_autofoo 1 +BuildRequires: automake libtool libtool-ltdl-devel +%endif + BuildRequires: libmusicbrainz-devel >= 2.1.0 BuildRequires: readline-devel ncurses-devel BuildRequires: zlib-devel @@ -51,11 +59,19 @@ %setup -q -n libtunepimp-%{version} %patch1 -p1 -b .gcc43 -%patch2 -p1 -b .libmad +%patch2 -p1 -b .glibc210_strrchr -libtoolize --force -aclocal -automake +%patch10 -p1 -b .libmad + +# 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 @@ -99,6 +115,9 @@ %changelog +* Fri Apr 03 2009 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 0.5.3-7 +- fix build (port fedora/rawhide build fixes) + * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.5.3-6 - rebuild for new F11 features