rpms/libtunepimp/FC-4 libtunepimp-0.4.3-PLUGIN_DIR.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 libtunepimp.spec, 1.6, 1.7 sources, 1.3, 1.4 libtunepimp-0.3.0-gcc4.patch, 1.1, NONE libtunepimp-0.4.2-198195.patch, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Mon Sep 25 13:45:43 UTC 2006 

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31509

Modified Files:
	.cvsignore libtunepimp.spec sources 
Added Files:
	libtunepimp-0.4.3-PLUGIN_DIR.patch 
Removed Files:
	libtunepimp-0.3.0-gcc4.patch libtunepimp-0.4.2-198195.patch 
Log Message:
* Thu Sep 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.3-4
- PLUGIN_DIR patch, fix lib64 issues


libtunepimp-0.4.3-PLUGIN_DIR.patch:

--- NEW FILE libtunepimp-0.4.3-PLUGIN_DIR.patch ---
--- libtunepimp-0.4.3/lib/Makefile.in.PLUGIN_DIR	2006-08-06 15:45:56.000000000 -0500
+++ libtunepimp-0.4.3/lib/Makefile.in	2006-09-14 14:15:23.000000000 -0500
@@ -114,7 +114,7 @@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = @CPPFLAGS@ -DPLUGIN_DIR=\"$(PLUGIN_DIR)\"
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -156,6 +156,7 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PLUGIN_DIR = $(pkglibdir)/plugins
 PREFIX = @PREFIX@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
--- libtunepimp-0.4.3/lib/tunepimp.cpp.PLUGIN_DIR	2006-08-06 15:39:19.000000000 -0500
+++ libtunepimp-0.4.3/lib/tunepimp.cpp	2006-09-14 13:59:12.000000000 -0500
@@ -45,8 +45,10 @@
 
 #define DB         printf("%s:%d\n", __FILE__, __LINE__);
 #ifndef WIN32
+#ifndef PLUGIN_DIR
 #define PLUGIN_DIR PREFIX"/lib/tunepimp/plugins"
 #endif
+#endif
 
 TunePimp::TunePimp(const string &appName, const string &appVersion, int startThreads, const char *pluginDir)
 {
--- libtunepimp-0.4.3/Makefile.in.PLUGIN_DIR	2006-08-06 15:46:00.000000000 -0500
+++ libtunepimp-0.4.3/Makefile.in	2006-09-14 14:16:24.000000000 -0500
@@ -129,6 +129,7 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PLUGIN_DIR = $(pkglibdir)/plugins
 PREFIX = @PREFIX@
 RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
@@ -680,8 +681,8 @@
 	mkdir -p $(DESTDIR)$(includedir)/tunepimp
 	$(INSTALL) -m 0644 $(srcdir)/include/tunepimp/tp_c.h $(DESTDIR)$(includedir)/tunepimp
 	$(INSTALL) -m 0644 $(srcdir)/include/tunepimp/defs.h $(DESTDIR)$(includedir)/tunepimp
-	mkdir -p $(DESTDIR)$(libdir)/tunepimp/plugins
-	$(INSTALL) -m 0655 examples/plugins/*.tpp $(DESTDIR)$(libdir)/tunepimp/plugins
+	mkdir -p $(DESTDIR)$(PLUGIN_DIR)
+	$(INSTALL) -m 0655 examples/plugins/*.tpp $(DESTDIR)$(PLUGIN_DIR)
 
 uninstall-local:
 	rm -rf $(libdir)/tunepimp/plugins $(libdir)/tunepimp


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Apr 2006 17:26:59 -0000	1.3
+++ .cvsignore	25 Sep 2006 13:45:43 -0000	1.4
@@ -1 +1,3 @@
 libtunepimp-0.4.2.tar.gz
+libtunepimp-0.4.3.tar.gz
+libtunepimp-0.5.1.tar.gz


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-4/libtunepimp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libtunepimp.spec	11 Jul 2006 12:46:49 -0000	1.6
+++ libtunepimp.spec	25 Sep 2006 13:45:43 -0000	1.7
@@ -1,8 +1,8 @@
 
 Summary: A library for creating MusicBrainz enabled tagging applications 
-Name:	 libtunepimp 
-Version: 0.4.2
-Release: 3%{?dist}
+Name:	 libtunepimp
+Version: 0.4.3
+Release: 4%{?dist}
 
 License: LGPL
 Group: 	 System Environment/Libraries
@@ -10,14 +10,24 @@
 Source:	 http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# "libtunepimp: stack smashing (buffer overflow)", http://bugzilla.redhat.com/198195
-Patch198195: libtunepimp-0.4.2-198195.patch
+# http://lists.musicbrainz.org/pipermail/musicbrainz-devel/2006-September/001856.html
+%define pkglibdir %{_libdir}/tunepimp
+Patch1: libtunepimp-0.4.3-PLUGIN_DIR.patch
 
-BuildRequires: readline-devel
-BuildRequires: libvorbis-devel
-BuildRequires: flac-devel
-BuildRequires: libmusicbrainz-devel >= 2.1.0
+BuildRequires: readline-devel ncurses-devel
 BuildRequires: zlib-devel
+BuildRequires: libmusicbrainz-devel >= 2.1.0
+BuildRequires: flac-devel
+BuildRequires: libvorbis-devel
+BuildRequires: taglib-devel
+# TODO/FIXME: see http://bugzilla.redhat.com/191036
+#BuildRequires: libmp4v2-devel
+
+%if "%{version}" >= "0.5.0"
+BuildRequires: expat-devel
+BuildRequires: curl-devel
+BuildRequires: libofa-devel
+%endif
 
 %description
 The TunePimp library is a development library geared towards developers 
@@ -32,19 +42,16 @@
 
 %package tools
 Summary: MusicBrainz tagging tools 
-Group: Applications/Multimedia
+Group:   Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
-#Obsoletes: trm < %{version}-%{release}
-#Provides:  trm = %{version}-%{release}
 %description tools
 %{summary}.
 
 
 %prep
-%setup -q
-
-%patch198195 -p1 -b .198195
+%setup -q -n libtunepimp-%{version}
 
+%patch1 -p1 -b .PLUGIN_DIR
 
 %build
 %configure \
@@ -52,13 +59,13 @@
   --disable-dependency-tracking \
   --enable-lgpl
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} PLUGIN_DIR=%{pkglibdir}/plugins
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT PLUGIN_DIR=%{pkglibdir}/plugins
 
 # unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
@@ -79,11 +86,13 @@
 # README omitted, it's mostly useless
 %doc README.LGPL
 %{_libdir}/lib*.so.*
-%dir %{_libdir}/tunepimp/
-%dir %{_libdir}/tunepimp/plugins/
-%{_libdir}/tunepimp/plugins/flac.tpp
-%{_libdir}/tunepimp/plugins/vorbis.tpp
-%{_libdir}/tunepimp/plugins/wav.tpp
+%dir %{pkglibdir}
+%dir %{pkglibdir}/plugins/
+%{pkglibdir}/tunepimp/plugins/flac.tpp
+%{pkglibdir}/tunepimp/plugins/mpc.tpp
+%{pkglibdir}/tunepimp/plugins/vorbis.tpp
+%{pkglibdir}/tunepimp/plugins/wav.tpp
+%{pkglibdir}/tunepimp/plugins/wma.tpp
 
 %files devel
 %defattr(-,root,root,-)
@@ -96,6 +105,18 @@
 
 
 %changelog
+* Thu Sep 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.3-4
+- PLUGIN_DIR patch, fix lib64 issues
+
+* Thu Aug 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.3-3
+- BR: taglib-devel, readline-devel, ncurses-devel
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.3-2
+- 0.4.3
+
+* Tue Jul 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.2-4
+- BR: ncurses-devel
+
 * Mon Jul 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.2-3
 - drop ancient,deprecated Obsoletes/Provides: trm
 - fix buffer overflow (bug #198195)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Mar 2006 18:08:47 -0000	1.3
+++ sources	25 Sep 2006 13:45:43 -0000	1.4
@@ -1 +1 @@
-10b9e4a2f1930aed78ef7ddaebbe0fde  libtunepimp-0.4.2.tar.gz
+3b6ea2f378a81a39b4b64c1aaf4b6d51  libtunepimp-0.4.3.tar.gz


--- libtunepimp-0.3.0-gcc4.patch DELETED ---


--- libtunepimp-0.4.2-198195.patch DELETED ---

More information about the fedora-extras-commits mailing list