rpms/libtunepimp/FC-5 libtunepimp-0.4.3-PLUGIN_DIR.patch, NONE, 1.1 libtunepimp.spec, 1.11, 1.12

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	libtunepimp.spec 
Added Files:
	libtunepimp-0.4.3-PLUGIN_DIR.patch 
Log Message:
+missing patch


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: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-5/libtunepimp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libtunepimp.spec	25 Sep 2006 13:43:21 -0000	1.11
+++ libtunepimp.spec	25 Sep 2006 13:46:40 -0000	1.12
@@ -2,7 +2,7 @@
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
 Version: 0.4.3
-Release: 4%{?dist}
+Release: 4%{?dist}.1
 
 License: LGPL
 Group: 	 System Environment/Libraries