rpms/gkrellm/devel gkrellm-2.2.9-libdir.patch, NONE, 1.1 gkrellm.spec, 1.32, 1.33

[fedora-cvs-commits at redhat.com]

Author: karsten

Update of /cvs/dist/rpms/gkrellm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15214

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-2.2.9-libdir.patch 
Log Message:
- fix header file conflict between 32bit and 64bit archs

gkrellm-2.2.9-libdir.patch:
 server/gkrellmd.h |   11 +++++++++--
 src/gkrellm.h     |   11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

--- NEW FILE gkrellm-2.2.9-libdir.patch ---
--- gkrellm-2.2.9/server/gkrellmd.h.libdir	2006-05-15 14:32:02.000000000 +0200
+++ gkrellm-2.2.9/server/gkrellmd.h	2006-05-15 14:35:02.000000000 +0200
@@ -105,9 +105,16 @@
 #define GKRELLMD_CONFIG     "gkrellmd.conf"
 
 #define GKRELLMD_PLUGINS_DIR		".gkrellm2/plugins-gkrellmd"
-#define GKRELLMD_LOCAL_PLUGINS_DIR	"/usr/local/lib/gkrellm2/plugins-gkrellmd"
+
+#if defined (__x86_64__) || defined (__s390x__) || defined (__ppc64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__alpha__)
+#define LIBDIREXT "lib64"
+#else
+#define LIBDIREXT "lib"
+#endif
+
+#define GKRELLMD_LOCAL_PLUGINS_DIR	"/usr/local/LIBDIREXT/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/LIBDIREXT/gkrellm2/plugins-gkrellmd"
 #endif
 
 #if !defined(WIN32)
--- gkrellm-2.2.9/src/gkrellm.h.libdir	2006-05-15 14:09:01.000000000 +0200
+++ gkrellm-2.2.9/src/gkrellm.h	2006-05-15 14:36:39.000000000 +0200
@@ -118,9 +118,16 @@
 #if !defined(SYSTEM_THEMES_DIR)
 #define	SYSTEM_THEMES_DIR		"/usr/share/gkrellm2/themes"
 #endif
-#define	LOCAL_PLUGINS_DIR		"/usr/local/lib/gkrellm2/plugins"
+
+#if defined (__x86_64__) || defined (__s390x__) || defined (__ppc64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__alpha__)
+#define LIBDIREXT "lib64"
+#else
+#define LIBDIREXT "lib"
+#endif  
+
+#define	LOCAL_PLUGINS_DIR		"/usr/local/LIBDIREXT/gkrellm2/plugins"
 #if !defined(SYSTEM_PLUGINS_DIR)
-#define	SYSTEM_PLUGINS_DIR		"/usr/lib/gkrellm2/plugins"
+#define	SYSTEM_PLUGINS_DIR		"/usr/LIBDIREXT/gkrellm2/plugins"
 #endif
 
 #else


Index: gkrellm.spec
===================================================================
RCS file: /cvs/dist/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gkrellm.spec	3 Apr 2006 09:39:45 -0000	1.32
+++ gkrellm.spec	15 May 2006 13:45:53 -0000	1.33
@@ -2,7 +2,7 @@
 Summary:	Multiple stacked system monitors in one process.
 Name:		gkrellm
 Version:	2.2.9
-Release:    1
+Release:    2
 License:	GPL
 Group:		Applications/System
 URL:		http://www.gkrellm.net/
@@ -15,6 +15,7 @@
 Patch2:		gkrellm-wifi-0.9.12-build.patch
 Patch3:		gkrellm-2.2.4-sansfont.patch
 Patch4:		gkrellm-2.2.7-width.patch
+Patch5:		gkrellm-2.2.9-libdir.patch
 Conflicts:	kernel < 2.6.2
 BuildRequires:	gtk2-devel, gettext, ImageMagick, openssl-devel, libSM-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -76,11 +77,13 @@
 %endif
 %patch3 -p1
 %patch4 -p1
-for i in gkrellmd.1 server/gkrellmd.h src/gkrellm.h gkrellm.1 README Changelog Changelog-plugins.html; do
+%patch5 -p1
+
+for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
    sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
    sed -i -e "s@/usr/lib/gkrellm/plugins@%{_libdir}/gkrellm2/plugins@" $i
 done
-for i in gkrellmd.1 server/gkrellmd.h src/gkrellm.h gkrellm.1 README Changelog Changelog-plugins.html; do
+for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
    sed -i -e "s@/usr/local/lib/gkrellm2/plugins@/usr/local/%{_lib}/gkrellm2/plugins@" $i
    sed -i -e "s@/usr/local/lib/gkrellm/plugins@/usr/local/%{_lib}/gkrellm2/plugins@" $i
 done
@@ -184,6 +187,9 @@
 %endif
 
 %changelog
+* Mon May 15 2006 Karsten Hopp <karsten at redhat.de> 2.2.9-2
+- fix header file conflict between 32bit and 64bit archs
+
 * Mon Apr 03 2006 Karsten Hopp <karsten at redhat.de> 2.2.9-1
 - update to 2.2.9
 - remove explicit UID/GUIs from useradd/groupadd (#186974)