rpms/nazghul/devel nazghul-0.5.3-64bit.patch, 1.1, 1.2 nazghul.spec, 1.2, 1.3

[Jason Tibbitts (tibbs)]

Author: tibbs

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

Modified Files:
	nazghul-0.5.3-64bit.patch nazghul.spec 
Log Message:
* Tue Feb 14 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.5.3-4
- More 64bit fixes.
- Package additional documentation.


nazghul-0.5.3-64bit.patch:

Index: nazghul-0.5.3-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/nazghul-0.5.3-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nazghul-0.5.3-64bit.patch	13 Feb 2006 18:10:24 -0000	1.1
+++ nazghul-0.5.3-64bit.patch	14 Feb 2006 17:21:02 -0000	1.2
@@ -56,3 +56,63 @@
  }
  
  int mapGetRadius(struct mview *view)
+--- src/scheme.c.64bit	2006-02-02 00:26:10.000000000 -0600
++++ src/scheme.c	2006-02-13 18:04:05.368035764 -0600
+@@ -594,7 +594,7 @@
+ 	  i = ++sc->last_cell_seg ;
+ 	  sc->alloc_seg[i] = cp;
+ 	  /* adjust in TYPE_BITS-bit boundary */
+-	  if(((int)cp)%adj!=0) {
++	  if(((long)cp)%adj!=0) {
+ 	    cp=(char*)(adj*((long)cp/adj+1));
+ 	  }
+         /* insert new segment in address order */
+@@ -2138,7 +2138,7 @@
+ 
+ static void s_save(scheme *sc, enum scheme_opcodes op, pointer args, pointer code) 
+ { 
+-  int nframes = (int)sc->dump; 
++  int nframes = (long)sc->dump; 
+   struct dump_stack_frame *next_frame; 
+ 
+   /* enough room for the next frame? */ 
+@@ -2158,7 +2158,7 @@
+ 
+ static pointer _s_return(scheme *sc, pointer a) 
+ { 
+-  int nframes = (int)sc->dump; 
++  int nframes = (long)sc->dump; 
+   struct dump_stack_frame *frame; 
+ 
+   sc->value = (a); 
+@@ -2198,7 +2198,7 @@
+ 
+ static INLINE void dump_stack_mark(scheme *sc) 
+ { 
+-  int nframes = (int)sc->dump;
++  int nframes = (long)sc->dump;
+   int i;
+   for(i=0; i<nframes; i++) {
+     struct dump_stack_frame *frame;
+--- src/closure.c.64bit	2006-02-13 18:08:57.162111298 -0600
++++ src/closure.c	2006-02-13 18:09:22.257237400 -0600
+@@ -149,7 +149,7 @@
+                 result = closure->sc->vptr->pair_cdr(pair);
+                 goto evaluate_result;
+         } else if (scm_is_ptr(closure->sc, result)) {
+-                ret = (int)closure->sc->vptr->ffvalue(result);
++                ret = (long)closure->sc->vptr->ffvalue(result);
+         }
+ 
+         return ret;
+--- src/tick.c.64bit	2006-02-13 18:17:08.352563117 -0600
++++ src/tick.c	2006-02-13 18:17:49.066410264 -0600
+@@ -37,7 +37,7 @@
+ 	int msecs;
+ 	SDL_Event tick_event;
+ 
+-        msecs = (int)data;
++        msecs = (long)data;
+ 	tick_event.type = SDL_USEREVENT;
+ 	tick_event.user.code = TICK_EVENT;
+ 


Index: nazghul.spec
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/nazghul.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nazghul.spec	13 Feb 2006 18:10:24 -0000	1.2
+++ nazghul.spec	14 Feb 2006 17:21:02 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           nazghul
 Version:        0.5.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A computer role-playing game (CRPG) engine
 
 Group:          Amusements/Games
@@ -37,6 +37,7 @@
 %setup -q
 %patch0
 %patch1 -b .64bit
+mv doc/* .
 
 
 %build
@@ -66,7 +67,8 @@
 %defattr(-,root,root,-)
 %{_bindir}/nazghul
 %dir %{_datadir}/nazghul
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS GAME_RULES GHULSCRIPT
+%doc MAP_HACKERS_GUIDE engine_extension_and_design world_building
 
 
 %files haxima
@@ -75,9 +77,14 @@
 %{_datadir}/nazghul/haxima
 %{_datadir}/applications/fedora-haxima.desktop
 %{_datadir}/pixmaps/haxima.png
+%doc USERS_GUIDE
 
 
 %changelog
+* Tue Feb 14 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.5.3-4
+- More 64bit fixes.
+- Package additional documentation.
+
 * Mon Feb 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.5.3-3
 - Add some 64-bit cleanliness fixes.