packages: gkrellm/gkrellm.spec, gkrellm/gkrellm-plugins_dir_lib64.patch (NE...

[august84]

Author: august84                     Date: Wed Oct 27 22:01:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- plugins_dir_lib64.patch added for 64-bit architectures (hardcoded paths)

---- Files affected:
packages/gkrellm:
   gkrellm.spec (1.133 -> 1.134) , gkrellm-plugins_dir_lib64.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gkrellm/gkrellm.spec
diff -u packages/gkrellm/gkrellm.spec:1.133 packages/gkrellm/gkrellm.spec:1.134
--- packages/gkrellm/gkrellm.spec:1.133	Thu Oct 14 22:34:33 2010
+++ packages/gkrellm/gkrellm.spec	Thu Oct 28 00:01:21 2010
@@ -26,6 +26,7 @@
 Patch3:		%{name}-lm_sensors.patch
 Patch4:		%{name}-ldflags.patch
 Patch5:		myflags.patch
+Patch6:		%{name}-plugins_dir_lib64.patch
 URL:		http://www.gkrellm.net/
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 2.2.0
@@ -138,6 +139,9 @@
 %patch3 -p1
 # %patch4 -p1
 %patch5 -p1
+%ifarch %{x8664} ia64 ppc64 sparc64
+%patch6 -p1
+%endif
 
 %build
 %{__make} \
@@ -214,6 +218,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.134  2010/10/27 22:01:21  august84
+- plugins_dir_lib64.patch added for 64-bit architectures (hardcoded paths)
+
 Revision 1.133  2010/10/14 20:34:33  uzsolt
 - 2.3.5
 - myflags.patch

================================================================
Index: packages/gkrellm/gkrellm-plugins_dir_lib64.patch
diff -u /dev/null packages/gkrellm/gkrellm-plugins_dir_lib64.patch:1.1
--- /dev/null	Thu Oct 28 00:01:30 2010
+++ packages/gkrellm/gkrellm-plugins_dir_lib64.patch	Thu Oct 28 00:01:21 2010
@@ -0,0 +1,39 @@
+--- gkrellm-2.2.9/README	2006-03-29 22:18:36.000000000 +0000
++++ gkrellm-2.2.9-lib64/README	2006-09-29 13:44:06.000000000 +0000
+@@ -759,7 +759,7 @@
+ 
+ GKrellM tries to load all plugins (shared object files ending in .so)
+ it finds in your plugin directory ~/.gkrellm2/plugins.  The directories
+-/usr/local/lib/gkrellm2/plugins and /usr/lib/gkrellm2/plugins are
++/usr/local/lib64/gkrellm2/plugins and /usr/lib64/gkrellm2/plugins are
+ also searched for plugins to install.
+ 
+ Some plugins may be available only as source files and they will
+--- gkrellm-2.3.4/src/gkrellm.h.orig	2010-07-19 14:18:56.000000000 +0200
++++ gkrellm-2.3.4/src/gkrellm.h	2010-07-19 14:20:53.000000000 +0200
+@@ -136,9 +136,9 @@
+ #if !defined(SYSTEM_THEMES_DIR)
+ #define	SYSTEM_THEMES_DIR		"/usr/share/gkrellm2/themes"
+ #endif
+-#define	LOCAL_PLUGINS_DIR		"/usr/local/lib/gkrellm2/plugins"
++#define	LOCAL_PLUGINS_DIR		"/usr/local/lib64/gkrellm2/plugins"
+ #if !defined(SYSTEM_PLUGINS_DIR)
+-#define	SYSTEM_PLUGINS_DIR		"/usr/lib/gkrellm2/plugins"
++#define	SYSTEM_PLUGINS_DIR		"/usr/lib64/gkrellm2/plugins"
+ #endif
+ 
+ #else
+--- gkrellm-2.3.4/server/gkrellmd.h.orig	2010-07-19 14:28:21.000000000 +0200
++++ gkrellm-2.3.4/server/gkrellmd.h	2010-07-19 14:28:43.000000000 +0200
+@@ -126,9 +126,9 @@
+ 
+ #define GKRELLMD_PLUGINS_DIR		".gkrellm2/plugins-gkrellmd"
+ #if !defined(WIN32)
+-	#define GKRELLMD_LOCAL_PLUGINS_DIR	"/usr/local/lib/gkrellm2/plugins-gkrellmd"
++	#define GKRELLMD_LOCAL_PLUGINS_DIR	"/usr/local/lib64/gkrellm2/plugins-gkrellmd"
+ 	#if !defined(GKRELLMD_SYSTEM_PLUGINS_DIR)
+-		#define GKRELLMD_SYSTEM_PLUGINS_DIR	"/usr/lib/gkrellm2/plugins-gkrellmd"
++		#define GKRELLMD_SYSTEM_PLUGINS_DIR	"/usr/lib64/gkrellm2/plugins-gkrellmd"
+ 	#endif
+ 	#define GKRELLMD_SYS_ETC	"/etc"
+ 	#define GKRELLMD_LOCAL_ETC	"/usr/local/etc"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gkrellm/gkrellm.spec?r1=1.133&r2=1.134&f=u