diff --git a/nazghul-0.5.3-64bit.patch b/nazghul-0.5.3-64bit.patch index b86838d..fa7a36a 100644 --- a/nazghul-0.5.3-64bit.patch +++ b/nazghul-0.5.3-64bit.patch @@ -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; isc->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; + diff --git a/nazghul.spec b/nazghul.spec index 76d73ce..489aadb 100644 --- a/nazghul.spec +++ b/nazghul.spec @@ -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 @@ You must install Nazghul in order to play Haxima. %setup -q %patch0 %patch1 -b .64bit +mv doc/* . %build @@ -66,7 +67,8 @@ rm -rf $RPM_BUILD_ROOT %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 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/nazghul/haxima %{_datadir}/applications/fedora-haxima.desktop %{_datadir}/pixmaps/haxima.png +%doc USERS_GUIDE %changelog +* Tue Feb 14 2006 Jason L Tibbitts III - 0.5.3-4 +- More 64bit fixes. +- Package additional documentation. + * Mon Feb 13 2006 Jason L Tibbitts III - 0.5.3-3 - Add some 64-bit cleanliness fixes.