[Rasta-commits] rev 212 - in trunk: . gtkrasta librasta redhat

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2003-10-22 20:07:03 -0500 (Wed, 22 Oct 2003)
New Revision: 212

Modified:
   trunk/ChangeLog
   trunk/gtkrasta/gtkrasta.c
   trunk/librasta/renumeration.c
   trunk/redhat/rasta.spec.in
Log:
x86_64

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2003-09-24 23:50:20 UTC (rev 211)
+++ trunk/ChangeLog	2003-10-23 01:07:03 UTC (rev 212)
@@ -1,5 +1,11 @@
 2003-09-24	Joel Becker	<joel.becker at oracle.com>
 
+	* librasta/renumeration.c: 64bit cast warning.
+	* gtkrasta/gtkrasta.c: 64bit cast warning.
+	* redhat/rasta.spec.in: Work on x86_64.
+
+2003-09-24	Joel Becker	<joel.becker at oracle.com>
+
 	* Makefile;am: Add variable for CGIRASTA.
 	* configure.in: Test for liblockfile and switch on cgirasta.
 	* acconfig.h: Add HAVE_LOCKFILE

Modified: trunk/gtkrasta/gtkrasta.c
===================================================================
--- trunk/gtkrasta/gtkrasta.c	2003-09-24 23:50:20 UTC (rev 211)
+++ trunk/gtkrasta/gtkrasta.c	2003-10-23 01:07:03 UTC (rev 212)
@@ -1852,7 +1852,8 @@
 {
     GtkRastaContext *main_ctxt;
     GIOStatus rc;
-    gint ret, bytes_read;
+    gint ret;
+    gsize bytes_read;
     gboolean cont;
     gchar *etext;
     GError *err;
@@ -2076,7 +2077,7 @@
 {
     GtkRastaContext *main_ctxt;
     GIOStatus rc;
-    gint bytes_read;
+    gsize bytes_read;
     gboolean cont;
     GError *err;
     static GString *out = NULL;
@@ -2165,7 +2166,7 @@
 {
     GtkRastaContext *main_ctxt;
     GIOStatus rc;
-    gint bytes_read;
+    gsize bytes_read;
     gboolean cont;
     GError *err;
     static GString *ers = NULL;
@@ -2514,7 +2515,7 @@
 {
     GtkRastaContext *main_ctxt;
     GIOStatus rc;
-    gint bytes_read;
+    gsize bytes_read;
     gboolean cont;
     GError *err;
     static GString *out = NULL;
@@ -2589,7 +2590,7 @@
 {
     GtkRastaContext *main_ctxt;
     GIOStatus rc;
-    gint bytes_read;
+    gsize bytes_read;
     gboolean cont;
     GError *err;
     static GString *ers = NULL;
@@ -3308,7 +3309,7 @@
 {
     GtkRastaContext *main_ctxt;
     GIOStatus rc;
-    gint bytes_read;
+    gsize bytes_read;
     gboolean cont;
     GError *err;
     static GString *out = NULL;
@@ -3388,7 +3389,7 @@
 {
     GtkRastaContext *main_ctxt;
     GIOStatus rc;
-    gint bytes_read;
+    gsize bytes_read;
     gboolean cont;
     GError *err;
     static GString *ers = NULL;

Modified: trunk/librasta/renumeration.c
===================================================================
--- trunk/librasta/renumeration.c	2003-09-24 23:50:20 UTC (rev 211)
+++ trunk/librasta/renumeration.c	2003-10-23 01:07:03 UTC (rev 212)
@@ -103,7 +103,7 @@
 
   result = (*enumeration->has_more_func) (enumeration->context);
 
-  return (gboolean) result;
+  return (gboolean)GPOINTER_TO_INT(result);
 }  /* r_enumeration_has_more() */
 
 gpointer
@@ -139,7 +139,7 @@
 
   result = (elem != NULL);
 
-  return (gpointer) result;
+  return GINT_TO_POINTER(result);
 }  /* r_enumeration_list_has_more() */
 
 static gpointer

Modified: trunk/redhat/rasta.spec.in
===================================================================
--- trunk/redhat/rasta.spec.in	2003-09-24 23:50:20 UTC (rev 211)
+++ trunk/redhat/rasta.spec.in	2003-10-23 01:07:03 UTC (rev 212)
@@ -20,7 +20,7 @@
 
 BuildRoot: %{_tmppath}/rasta-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
 
-Patch001: rasta-0.1-cgibug.patch
+#Patch001: rasta-0.1-cgibug.patch
 
 %description
 RASTA is a system for template driven menus and actions.  It uses a
@@ -117,7 +117,7 @@
 
 %prep
 %setup
-%patch001 -p1
+#%patch001 -p1
 
 %build
 %configure
@@ -132,15 +132,25 @@
 
 %files -n librasta
 %defattr(-,root,root)
+%ifarch x86_64
+/usr/lib64/librasta*.so.*
+%else
 /usr/lib/librasta*.so.*
+%endif
 /usr/share/rasta/rasta-*/rasta.dtd
 /usr/share/rasta/rasta-*/rastastate.dtd
 
 %files -n librasta-devel
 %defattr(-,root,root)
+%ifarch x86_64
+/usr/lib64/*.a
+/usr/lib64/*.so
+/usr/lib64/pkgconfig/*.pc
+%else
 /usr/lib/*.a
 /usr/lib/*.so
 /usr/lib/pkgconfig/*.pc
+%endif
 /usr/include/
 
 %files -n clrasta