rpms/libtunepimp/devel libtunepimp-0.5.1-PLUGIN_DIR.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 libtunepimp.spec, 1.18, 1.19 sources, 1.4, 1.5 libtunepimp-0.4.3-PLUGIN_DIR.patch, 1.1, NONE

Tue Sep 26 18:06:04 UTC 2006

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26520

Modified Files:
	.cvsignore libtunepimp.spec sources 
Added Files:
	libtunepimp-0.5.1-PLUGIN_DIR.patch 
Removed Files:
	libtunepimp-0.4.3-PLUGIN_DIR.patch 
Log Message:
* Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.1-2
- drop -tools subpkg

* Thu Sep 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.1-1
- PLUGIN_DIR patch, fix lib64 issues, make parallel-installable
  with libtunepimp-0.4


libtunepimp-0.5.1-PLUGIN_DIR.patch:

--- NEW FILE libtunepimp-0.5.1-PLUGIN_DIR.patch ---
--- libtunepimp-0.5.1/lib/Makefile.in.PLUGIN_DIR	2006-08-06 14:31:06.000000000 -0500
+++ libtunepimp-0.5.1/lib/Makefile.in	2006-09-14 14:25:27.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@
@@ -158,6 +158,7 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PLUGIN_DIR = $(pkglibdir)/plugins
 PREFIX = @PREFIX@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
--- libtunepimp-0.5.1/lib/tunepimp.cpp.PLUGIN_DIR	2006-08-06 12:23:03.000000000 -0500
+++ libtunepimp-0.5.1/lib/tunepimp.cpp	2006-09-14 14:25:27.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.5.1/Makefile.in.PLUGIN_DIR	2006-08-06 14:31:12.000000000 -0500
+++ libtunepimp-0.5.1/Makefile.in	2006-09-14 14:27:00.000000000 -0500
@@ -133,6 +133,7 @@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PLUGIN_DIR = $(pkglibdir)/plugins
 PREFIX = @PREFIX@
 RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
@@ -683,11 +684,12 @@
 	rm -f $(PACKAGE)-$(VERSION).tar.gz
 
 install-data-local:
-	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
+	rm -rf $(PLUGIN_DIR) $(libdir)/tunepimp
 	rm -rf $(includedir)/tunepimp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Aug 2006 16:21:40 -0000	1.4
+++ .cvsignore	26 Sep 2006 18:06:03 -0000	1.5
@@ -1,3 +1,2 @@
-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/devel/libtunepimp.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libtunepimp.spec	25 Sep 2006 16:22:38 -0000	1.18
+++ libtunepimp.spec	26 Sep 2006 18:06:03 -0000	1.19
@@ -1,8 +1,8 @@
 
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
-Version: 0.4.3
-Release: 6%{?dist}
+Version: 0.5.1
+Release: 2%{?dist}
 
 License: LGPL
 Group: 	 System Environment/Libraries
@@ -11,22 +11,29 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # http://lists.musicbrainz.org/pipermail/musicbrainz-devel/2006-September/001856.html
-%define pkglibdir %{_libdir}/tunepimp
-Patch1: libtunepimp-0.4.3-PLUGIN_DIR.patch
+%define pkglibdir %{_libdir}/tunepimp-0.5
+Patch1: libtunepimp-0.5.1-PLUGIN_DIR.patch
 
 BuildRequires: readline-devel ncurses-devel
-BuildRequires: zlib-devel
-BuildRequires: libmusicbrainz-devel >= 2.1.0
-BuildRequires: flac-devel
 BuildRequires: libvorbis-devel
+BuildRequires: flac-devel
+BuildRequires: libmusicbrainz-devel >= 2.1.0
+BuildRequires: zlib-devel
 BuildRequires: taglib-devel
-# TODO/FIXME: see http://bugzilla.redhat.com/191036
-#BuildRequires: libmp4v2-devel
+BuildRequires: readline-devel ncurses-devel
+BuildRequires: libmpcdec-devel
 
-%if "%{version}" >= "0.5.0"
-BuildRequires: expat-devel
-BuildRequires: curl-devel
 BuildRequires: libofa-devel
+# These two are likely bogus (used just in examples/ ) -- Rex
+BuildRequires: curl-devel
+BuildRequires: expat-devel
+
+Obsoletes: libtunepimp-tools < %{version}-%{release}
+Provides:  libtunepimp-tools = %{version}-%{release}
+
+%if "%{name}" == "libtunepimp"
+Obsoletes: libtunepimp5 < %{version}-%{release}
+Provides:  libtunepimp5 = %{version}-%{release}
 %endif
 
 %description
@@ -37,22 +44,21 @@
 Summary: Headers for developing programs that will use %{name} 
 Group:   Development/Libraries
 Requires: %{name} = %{version}-%{release}
+%if "%{name}" == "libtunepimp"
+Provides:  libtunepimp5-devel = %{version}-%{release}
+%else
+Conflicts: libtunepimp-devel
+%endif
 %description devel
 %{summary}.
 
-%package tools
-Summary: MusicBrainz tagging tools 
-Group:   Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-%description tools
-%{summary}.
-
 
 %prep
 %setup -q -n libtunepimp-%{version}
 
 %patch1 -p1 -b .PLUGIN_DIR
 
+
 %build
 %configure \
   --disable-static \
@@ -85,28 +91,32 @@
 %doc AUTHORS COPYING ChangeLog TODO 
 # README omitted, it's mostly useless
 %doc README.LGPL
+%{_bindir}/puid
 %{_libdir}/lib*.so.*
-%dir %{pkglibdir}
+%dir %{pkglibdir}/
 %dir %{pkglibdir}/plugins/
 %{pkglibdir}/plugins/flac.tpp
 %{pkglibdir}/plugins/mpc.tpp
+%{pkglibdir}/plugins/speex.tpp
 %{pkglibdir}/plugins/vorbis.tpp
+%{pkglibdir}/plugins/tta.tpp
 %{pkglibdir}/plugins/wav.tpp
 %{pkglibdir}/plugins/wma.tpp
+%{pkglibdir}/plugins/wv.tpp
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/lib*.so
 
-%files tools
-%defattr(-,root,root,-)
-%{_bindir}/*
-
 
 %changelog
-* Thu Sep 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.3-6
-- PLUGIN_DIR patch, fix lib64 issues
+* Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.1-2
+- drop -tools subpkg
+
+* Thu Sep 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.5.1-1
+- PLUGIN_DIR patch, fix lib64 issues, make parallel-installable
+  with libtunepimp-0.4
 
 * Thu Aug 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.3-3
 - BR: taglib-devel, readline-devel, ncurses-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Aug 2006 16:21:40 -0000	1.4
+++ sources	26 Sep 2006 18:06:03 -0000	1.5
@@ -1 +1 @@
-3b6ea2f378a81a39b4b64c1aaf4b6d51  libtunepimp-0.4.3.tar.gz
+51809faed41fb8f12be15846214abc3a  libtunepimp-0.5.1.tar.gz


--- libtunepimp-0.4.3-PLUGIN_DIR.patch DELETED ---


