Changes of Revision 2
| [-] | Changed | libtunepimp.spec |
|
x 1 2 # norootforbuild3 4 -%define _prefix /usr5 %define soname 56 7 -%if %suse_version >= 9308 -%define split_mad 19 -%endif10 -11 %if %{?_with_perl:1}012 %define with_perl 113 %endif14 15 -%if %suse_version >= 103016 +%if %suse_version >= 1030 || %suse_version < 102017 Name: libtunepimp%{soname}18 %else19 -%if %suse_version >= 102020 Name: libtunepimp21 -%else22 -Name: libtunepimp%{soname}23 -%endif24 %endif25 Version: 0.5.326 Release: 10027 28 Source: http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz29 Patch1: libtunepimp-plugins-5.diff30 Patch2: libtunepimp-acinclude.diff31 +Patch3: libtunepimp-fixes.patch32 +Patch4: libtunepimp-ltdl.patch33 URL: http://www.musicbrainz.org34 Group: System/Libraries35 License: GNU Library General Public License version 2 (LGPL 2)36 BuildRoot: %{_tmppath}/build-%{name}-%{version}37 -BuildRequires: libmusicbrainz-devel flac-devel38 +BuildRequires: libmusicbrainz-devel flac-devel mpeg4ip39 BuildRequires: libogg-devel libvorbis-devel mad-devel40 +%if %suse_version >= 103041 +# workaround for broken lbuild42 +BuildRequires: libreadline543 +%endif44 BuildRequires: ncurses-devel readline-devel zlib-devel45 BuildRequires: taglib-devel libmp4v2-devel libofa-devel46 %if %suse_version < 102047 BuildRequires: taglib48 %endif49 BuildRequires: openssl-devel fftw3-devel curl-devel50 +%if %suse_version >= 102051 +BuildRequires: libmpcdec-devel52 +%else53 BuildRequires: libmpcdec54 -BuildRequires: gcc-c++ libstdc++ libstdc++-devel make glibc-devel55 +%endif56 +BuildRequires: gcc-c++ libstdc++-devel make glibc-devel57 BuildRequires: python python-devel58 BuildRequires: autoconf automake libtool59 Obsoletes: trm60 61 server is designed to enable Audio CD and MP3/Vorbis players to62 download metadata about the music they are playing.63 64 -%if %{?!split_mp3:1}065 -This package includes support for MP3, MP4, Ogg/Vorbis, FLAC and WMA.66 -%else67 -This package includes support for MP4, Ogg/Vorbis, FLAC and WMA.68 -MP3 support is available by installing the %{name}-mad package.69 -%endif70 -71 %package -n libtunepimp-devel72 Summary: Include Files and Libraries mandatory for Development.73 Group: Development/Libraries/C and C++74 75 %description -n python-libtunepimp76 Python bindings for %{name}77 78 -%if %{?split_mad:1}079 %package mad80 -Summary: MP3 support for %{name}81 +Summary: MP3 Support Plugin for %{name}82 Requires: %{name} = %{version}-%{release}83 Group: System/Libraries84 %if %suse_version >= 1020 && %suse_version < 103085 Provides: libtunepimp%{soname}-mad = %{version}-%{release}86 +%else87 +Provides: libtunepimp-mad = %{version}-%{release}88 %endif89 +Provides: libtunepimp%{soname}-mp3 = %{version}-%{release}90 +Provides: libtunepimp-mp3 = %{version}-%{release}91 92 %description mad93 This package adds MP3 support to libtunepimp94 -%endif95 96 %package mp497 -Summary: MP4 Plugin for %{name}98 +Summary: MP4 Support Plugin for %{name}99 Group: System/Libraries100 Requires: %{name} = %{version}-%{release}101 %if %suse_version >= 1020 && %suse_version < 1030102 Provides: libtunepimp%{soname}-mp4 = %{version}-%{release}103 +%else104 +Provides: libtunepimp-mp4 = %{version}-%{release}105 %endif106 107 %description mp4108 109 Group: Development/Libraries/Perl110 Requires: %{name} = %{version}-%{release}111 Provides: libtunepimp-perl = %{version}-%{release}112 +Provides: libtunepimp%{soname}-perl = %{version}-%{release}113 Provides: perl-libtunepimp%{soname} = %{version}-%{release}114 115 %description -n perl-libtunepimp116 Provides Perl bindings for %{name}.117 %endif118 119 +%if %suse_version >= 1030120 +%package -n libtunepimp121 +%else122 %package -n libtunepimp-tools123 +%endif124 Summary: Command-Line Tools that use %{name}125 Group: Productivity/Multimedia/Sound/Utilities126 Requires: %{name} = %{version}-%{release}127 +%if %suse_version >= 1030128 +Provides: libtunepimp-tools = %{version}-%{release}129 +%else130 Provides: libtunepimp%{soname}-tools = %{version}-%{release}131 +%endif132 133 +%if %suse_version >= 1030134 +%description -n libtunepimp135 +%else136 %description -n libtunepimp-tools137 +%endif138 Command-line tools for %{name}.139 140 -%if %suse_version >= 930141 %debug_package142 -%endif143 %prep144 %setup -q -n "libtunepimp-%{version}"145 +%if %suse_version < 1030146 %patch1147 +%endif148 %patch2149 +%patch3 -p1150 +%patch4151 152 %build153 autoreconf -fiv154 155 # Aliasing problems in mp4.cpp:156 export CXXFLAGS="%{optflags} -fno-strict-aliasing"157 %configure158 -159 %__make %{?jobs:-j%{jobs}}160 161 pushd python162 163 popd #perl/tunepimp-perl164 %endif165 166 -%if %suse_version < 930167 -%__strip "%{buildroot}%{_bindir}"/* \168 - "%{buildroot}%{_libdir}"/lib*.so.* \169 - "%{buildroot}%{_libdir}/tunepimp05/plugins"/*.tpp \170 - 2>/dev/null || :171 -%endif172 -173 %post -n %{name} -p /sbin/ldconfig174 175 %postun -n %{name} -p /sbin/ldconfig176 177 %doc AUTHORS ChangeLog COPYING README README.LGPL TODO178 %{_libdir}/libtunepimp.so.%{soname}179 %{_libdir}/libtunepimp.so.%{soname}.*180 -%dir %{_libdir}/tunepimp*181 +# only explicitly check for the exact directory name182 +# here (to make sure we don't inadvertisedly use183 +# libdir/libtunepimp5 on openSUSE 10.3); for the other184 +# files that follow, just use a * to avoid duplicating185 +# all lines for 10.3 and !=10.3186 +%if %suse_version >= 1030187 +%dir %{_libdir}/tunepimp188 +%else189 +%dir %{_libdir}/tunepimp%{soname}190 +%endif191 %dir %{_libdir}/tunepimp*/plugins192 %{_libdir}/tunepimp*/plugins/flac.tpp193 -%if %{?!split_mad:1}0194 -%{_libdir}/tunepimp*/plugins/mp3.tpp195 -%endif196 %{_libdir}/tunepimp*/plugins/mpc.tpp197 %{_libdir}/tunepimp*/plugins/vorbis.tpp198 %{_libdir}/tunepimp*/plugins/wav.tpp199 200 %{_libdir}/tunepimp*/plugins/speex.tpp201 |
||
| [+] | Added | libtunepimp-fixes.patch ^ |
| @@ -0,0 +1,121 @@ +--- libtunepimp-0.5.3/lib/utf8/utf8util.cpp.xx 2007-10-24 10:32:24.000000000 +0200 ++++ libtunepimp-0.5.3/lib/utf8/utf8util.cpp 2007-10-24 10:32:34.000000000 +0200 +@@ -26,6 +26,7 @@ + ----------------------------------------------------------------------------*/ + + #include <stdio.h> ++#include <cstdlib> + #include "utf8util.h" + #include "utf8.h" + #ifdef WIN32 +--- libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h.xx 2007-10-24 10:59:51.000000000 +0200 ++++ libtunepimp-0.5.3/include/tunepimp-0.5/metadata.h 2007-10-24 11:01:16.000000000 +0200 +@@ -28,6 +28,7 @@ + #define __METADATA_H__ + + #include <string> ++#include <cstring> + #include <cstdio> + + #include "defs.h" +--- libtunepimp-0.5.3/lib/metadata.cpp.xx 2007-10-24 11:01:59.000000000 +0200 ++++ libtunepimp-0.5.3/lib/metadata.cpp 2007-10-24 11:02:29.000000000 +0200 +@@ -25,6 +25,7 @@ + + ----------------------------------------------------------------------------*/ + #include <math.h> ++#include <cstdlib> + #include <stdio.h> + #include "metadata.h" + #include "../config.h" +--- libtunepimp-0.5.3/lib/protocol.cpp.xx 2007-10-24 11:03:57.000000000 +0200 ++++ libtunepimp-0.5.3/lib/protocol.cpp 2007-10-24 11:04:02.000000000 +0200 +@@ -9,6 +9,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string> ++#include <cstring> + #include <map> + #include <expat.h> + #include <curl/curl.h> +--- libtunepimp-0.5.3/lib/tunepimp.cpp.xx 2007-10-24 11:00:22.000000000 +0200 ++++ libtunepimp-0.5.3/lib/tunepimp.cpp 2007-10-24 11:00:31.000000000 +0200 +@@ -32,6 +32,7 @@ + + #include <stdio.h> + #include <map> ++#include <cstdlib> + using namespace std; + + #ifdef WIN32 +--- libtunepimp-0.5.3/lib/c_wrapper.cpp.xx 2007-10-24 11:02:52.000000000 +0200 ++++ libtunepimp-0.5.3/lib/c_wrapper.cpp 2007-10-24 11:03:02.000000000 +0200 +@@ -28,6 +28,7 @@ + #include "mutex.h" + #include "tp_c.h" + #include "astrcmp.h" ++#include <cstdlib> + + #define DB printf("%s:%d\n", __FILE__, __LINE__); + +--- libtunepimp-0.5.3/lib/readmeta.cpp.xx 2007-10-24 11:03:19.000000000 +0200 ++++ libtunepimp-0.5.3/lib/readmeta.cpp 2007-10-24 11:03:27.000000000 +0200 +@@ -31,6 +31,7 @@ + #endif + + #include <stdio.h> ++#include <cstdlib> + #ifndef WIN32 + #include <unistd.h> + #endif +--- libtunepimp-0.5.3/lib/fileio.cpp.xx 2007-10-24 11:03:40.000000000 +0200 ++++ libtunepimp-0.5.3/lib/fileio.cpp 2007-10-24 11:03:47.000000000 +0200 +@@ -28,6 +28,8 @@ + #include <assert.h> + #include <errno.h> + #include <string> ++#include <cstring> ++#include <cstdlib> + #ifndef WIN32 + #include <unistd.h> + #endif +--- libtunepimp-0.5.3/plugins/wma/wmafile.cpp.xx 2007-10-24 11:04:53.000000000 +0200 ++++ libtunepimp-0.5.3/plugins/wma/wmafile.cpp 2007-10-24 11:05:00.000000000 +0200 +@@ -20,6 +20,7 @@ + ***************************************************************************/ + + #include <tstring.h> ++#include <cstring> + #include <wmafile.h> + #include <wmatag.h> + #include <wmaproperties.h> +--- libtunepimp-0.5.3/plugins/wma/wma.cpp.xx 2007-10-24 11:04:32.000000000 +0200 ++++ libtunepimp-0.5.3/plugins/wma/wma.cpp 2007-10-24 11:04:40.000000000 +0200 +@@ -27,6 +27,7 @@ + + #include <string.h> + #include <stdio.h> ++#include <cstdlib> + #include <wmafile.h> + #include "metadata.h" + #include "plugin.h" +--- libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp.orig 2008-04-27 00:57:25.000000000 +0200 ++++ libtunepimp-0.5.3/plugins/mp3/id3_2_3_meta.cpp 2008-04-27 00:57:55.000000000 +0200 +@@ -28,6 +28,7 @@ + #include <stdio.h> + #include <assert.h> + #include <ctype.h> ++#include <cstdlib> + #include <musicbrainz/mb_c.h> + #include "mp3.h" + #include "id3_2_3_meta.h" +--- libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp.orig 2008-04-27 10:01:09.000000000 +0200 ++++ libtunepimp-0.5.3/plugins/mp3/id3_meta.cpp 2008-04-27 10:01:22.000000000 +0200 +@@ -28,6 +28,7 @@ + #include <stdio.h> + #include <time.h> + #include <ctype.h> ++#include <cstdlib> + #include <musicbrainz/mb_c.h> + #include "mp3.h" + #include "id3_meta.h" | ||
| [+] | Added | libtunepimp-ltdl.patch ^ |
| @@ -0,0 +1,44 @@ +--- lib/plugins.cpp ++++ lib/plugins.cpp +@@ -103,12 +103,12 @@ int Plugins::load(const char *path, bool + strcat(init_func, "InitPlugin"); + + /* Opened plugin ok, now locate our entry function */ +- init_function = (Plugin *(*)(void))lt_dlsym((lt_dlhandle_struct *)info.handle, init_func); ++ init_function = (Plugin *(*)(void))lt_dlsym((lt_dlhandle)info.handle, init_func); + if (init_function == NULL) + { + if (printDebugInfo) + fprintf(stderr, "Cannot find entry point in %s (%s).\n", file, lt_dlerror()); +- lt_dlclose((lt_dlhandle_struct *)info.handle); ++ lt_dlclose((lt_dlhandle)info.handle); + continue; + } + +@@ -116,7 +116,7 @@ int Plugins::load(const char *path, bool + info.methods = (*init_function)(); + if (info.methods == NULL) + { +- lt_dlclose((lt_dlhandle_struct *)info.handle); ++ lt_dlclose((lt_dlhandle)info.handle); + if (printDebugInfo) + fprintf(stderr, "Cannot retrieve supported methods from %s.\n", file); + continue; +@@ -150,7 +150,7 @@ int Plugins::load(const char *path, bool + fprintf(stderr, " [Plugin %s has already been loaded. " + "Skipping.]\n", info.file); + info.methods->shutdown(); +- lt_dlclose((lt_dlhandle_struct *)info.handle); ++ lt_dlclose((lt_dlhandle)info.handle); + break; + } + } +@@ -173,7 +173,7 @@ void Plugins::unload(void) + if ((*i).handle) + { + (*i).methods->shutdown(); +- lt_dlclose((lt_dlhandle_struct *)(*i).handle); ++ lt_dlclose((lt_dlhandle)(*i).handle); + (*i).handle = NULL; + } + } | ||
| Added | libtunepimp5-0.5.3-100.pm.9.src.rpm ^ | |