rpms/gmpc/devel gmpc-lib-plugins.diff,1.3,1.4 gmpc.spec,1.19,1.20

[Adrian Reber]

Author: adrian

Update of /cvs/extras/rpms/gmpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23745

Modified Files:
	gmpc-lib-plugins.diff gmpc.spec 
Log Message:
* Wed Oct 01 2008 Adrian Reber <adrian at lisas.de> - 0.15.5.0-4
- re-created patch to apply cleanly (fixes #465008)


gmpc-lib-plugins.diff:

Index: gmpc-lib-plugins.diff
===================================================================
RCS file: /cvs/extras/rpms/gmpc/devel/gmpc-lib-plugins.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gmpc-lib-plugins.diff	11 Nov 2007 16:35:19 -0000	1.3
+++ gmpc-lib-plugins.diff	1 Oct 2008 16:30:50 -0000	1.4
@@ -1,13 +1,14 @@
-diff -ur gmpc-0.15.1/src/main.c new/src/main.c
---- gmpc-0.15.1/src/main.c	2007-11-11 16:27:45.000000000 +0100
-+++ new/src/main.c	2007-11-11 16:27:09.000000000 +0100
-@@ -527,6 +527,9 @@
- 
+diff --git a/src/main.c b/src/main.c
+index e4c03c0..56ab24a 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -545,6 +545,9 @@ int main (int argc, char **argv)
+ 	q_free(packagedir);
  
  #else
 +	url = g_strdup_printf("%s%c%s",@@PLUGINS_PATH@@, G_DIR_SEPARATOR, "plugins");
 +	plugin_load_dir(url);
 +	q_free(url);
  	/** Load the global installed plugins */
- 	url = g_strdup_printf("%s%c%s",GLADE_PATH,G_DIR_SEPARATOR, "plugins");
+ 	url = g_build_path(G_DIR_SEPARATOR_S, GLADE_PATH,"plugins",NULL);
  #endif


Index: gmpc.spec
===================================================================
RCS file: /cvs/extras/rpms/gmpc/devel/gmpc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gmpc.spec	18 Feb 2008 18:44:40 -0000	1.19
+++ gmpc.spec	1 Oct 2008 16:30:50 -0000	1.20
@@ -1,7 +1,7 @@
 Name:           gmpc
 Summary:        GNOME frontend for the MPD
 Version:        0.15.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -137,6 +137,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Oct 01 2008 Adrian Reber <adrian at lisas.de> - 0.15.5.0-4
+- re-created patch to apply cleanly (fixes #465008)
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.15.5.0-3
 - Autorebuild for GCC 4.3