rpms/gambas/devel gambas-1.0.16-64bit.patch, NONE, 1.1 gambas.spec, 1.14, 1.15

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	gambas.spec 
Added Files:
	gambas-1.0.16-64bit.patch 
Log Message:

Fix the 64 bit architectures.


gambas-1.0.16-64bit.patch:

--- NEW FILE gambas-1.0.16-64bit.patch ---
--- gambas-1.0.16/src/comp/gbi.c.BAD	2006-07-10 13:43:34.000000000 -0500
+++ gambas-1.0.16/src/comp/gbi.c	2006-07-10 13:48:55.000000000 -0500
@@ -115,7 +115,11 @@
     strncpy(_root, FILE_get_dir(FILE_get_dir(path)), MAX_PATH);
   }
   
+#if defined(_X86_64_) || defined(_IA64_) || defined(_PPC64_) || defined(_SPARC64_)
+  strcpy(_lib_path, FILE_cat(_root, "lib64/gambas", NULL));
+#else
   strcpy(_lib_path, FILE_cat(_root, "lib/gambas", NULL));
+#endif
   strcpy(_info_path, FILE_cat(_root, "share/gambas/info", NULL));
 
   if (lt_dlinit())
--- gambas-1.0.16/src/exec/gbx_project.c.BAD	2006-07-10 13:59:40.000000000 -0500
+++ gambas-1.0.16/src/exec/gbx_project.c	2006-07-10 14:00:11.000000000 -0500
@@ -254,7 +254,11 @@
   
   STRING_new(&PROJECT_exec_path, FILE_get_dir(FILE_get_dir(path)), -1);
 
+#if defined(_X86_64_) || defined(_IA64_) || defined(_PPC64_) || defined(_SPARC64_)
+  STRING_new(&PROJECT_lib_path, FILE_cat(PROJECT_exec_path, "lib64/gambas", NULL), 0);
+#else
   STRING_new(&PROJECT_lib_path, FILE_cat(PROJECT_exec_path, "lib/gambas", NULL), 0);
+#endif
 
   /* fichier projet */
 


Index: gambas.spec
===================================================================
RCS file: /cvs/extras/rpms/gambas/devel/gambas.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gambas.spec	7 Jul 2006 15:54:23 -0000	1.14
+++ gambas.spec	10 Jul 2006 19:06:36 -0000	1.15
@@ -1,7 +1,7 @@
 Name:		gambas
 Summary: 	IDE based on a basic interpreter with object extensions
 Version: 	1.0.16
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Development/Tools
 URL: 		http://gambas.sourceforge.net/
@@ -23,6 +23,7 @@
 Patch2:		gambas-1.0.6-noopt.patch
 Patch3:		gambas-1.0.11-desktopfix.patch
 Patch4:		gambas-1.0.13-gettextfix.patch
+Patch5:		gambas-1.0.16-64bit.patch
 
 %description
 Gambas is a free development environment based on a Basic interpreter
@@ -210,6 +211,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 
 %build
@@ -414,6 +416,9 @@
 %{_datadir}/gambas/info/gb.xml.libxml.xslt.*
 
 %changelog
+* Mon Jul 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.16-2
+- fix 64bit arches
+
 * Fri Jul  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.16-1
 - bump to 1.0.16