rpms/abuse/devel .cvsignore, 1.2, 1.3 abuse.spec, 1.7, 1.8 abuse_sdl-0.7.0-fixes.patch, 1.1, 1.2 sources, 1.2, 1.3 abuse_sdl-0.7.0-debian.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	.cvsignore abuse.spec abuse_sdl-0.7.0-fixes.patch sources 
Removed Files:
	abuse_sdl-0.7.0-debian.patch 
Log Message:
* Mon Mar  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.1-1
- Upstream is alive again, new upstream release 0.7.1, yeah!



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abuse/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Aug 2006 05:27:25 -0000	1.2
+++ .cvsignore	4 Mar 2008 09:41:07 -0000	1.3
@@ -1 +1 @@
-abuse_sdl-0.7.0.tar.bz2
+abuse-0.7.1.tar.gz


Index: abuse.spec
===================================================================
RCS file: /cvs/extras/rpms/abuse/devel/abuse.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- abuse.spec	19 Feb 2008 07:47:39 -0000	1.7
+++ abuse.spec	4 Mar 2008 09:41:07 -0000	1.8
@@ -1,18 +1,20 @@
 Name:           abuse
-Version:        0.7.0
-Release:        6%{?dist}
+Version:        0.7.1
+Release:        1%{?dist}
 Summary:        The classic Crack-Dot-Com game
 Group:          Amusements/Games
-License:        GPL+
-URL:            http://happypenguin.org/show?Abuse-SDL
-# no URL upstream's site is gone
-Source0:        abuse_sdl-%{version}.tar.bz2
-Patch0:         abuse_sdl-0.7.0-debian.patch
+License:        GPLv2+
+URL:            http://abuse.zoy.org/
+# no URL, as downloading requires a parameter, this file is:
+# http://abuse.zoy.org/attachment/wiki/Downloads/abuse-0.7.1.tar.gz?format=raw
+Source0:        %{name}-%{version}.tar.gz
 Patch1:         abuse_sdl-0.7.0-fixes.patch
 Patch2:         abuse_sdl-0.7.0-exit-intro-crash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel alsa-lib-devel libGLU-devel
-Requires:       abuse-data hicolor-icon-theme
+# abuse-data >= 0.7.1 as the included desktop files needs to be updated for the
+# fact thar out binary was renamed from abuse.sdl to just abuse
+Requires:       abuse-data >= 0.7.1, hicolor-icon-theme
 
 %description
 This is the SDL version of Abuse, the classic Crack-Dot-Com game. It can run in
@@ -20,8 +22,7 @@
 
 
 %prep
-%setup -q -n abuse_sdl-%{version}
-%patch0 -p1 -z .deb
+%setup -q
 %patch1 -p1 -z .fix
 %patch2 -p1 -z .intro
 
@@ -60,12 +61,15 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS README TODO COPYING
-%{_bindir}/%{name}.sdl
-%{_mandir}/man6/%{name}-sdl.6.gz
+%{_bindir}/%{name}
+%{_mandir}/man6/%{name}.6.gz
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 %changelog
+* Mon Mar  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.7.1-1
+- Upstream is alive again, new upstream release 0.7.1, yeah!
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7.0-6
 - Autorebuild for GCC 4.3
 

abuse_sdl-0.7.0-fixes.patch:

Index: abuse_sdl-0.7.0-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/abuse/devel/abuse_sdl-0.7.0-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- abuse_sdl-0.7.0-fixes.patch	18 Aug 2006 05:27:25 -0000	1.1
+++ abuse_sdl-0.7.0-fixes.patch	4 Mar 2008 09:41:07 -0000	1.2
@@ -1,59 +1,17 @@
-diff -ur abuse_sdl-0.7.0.orig/src/include/stack.hpp abuse_sdl-0.7.0/src/include/stack.hpp
---- abuse_sdl-0.7.0.orig/src/include/stack.hpp	2002-12-15 06:00:32.000000000 +0100
-+++ abuse_sdl-0.7.0/src/include/stack.hpp	2006-08-16 16:54:58.000000000 +0200
-@@ -13,20 +13,38 @@
- { 
-   public :
-   T **sdata;
--  long son;
--
--  grow_stack(int max_size) { sdata=(T **)jmalloc(max_size,"pointer stack");  son=0; }
-+  unsigned int son, _max_size;
+--- abuse-0.7.1/src/stack.hpp.fix	2008-03-02 15:23:26.000000000 +0100
++++ abuse-0.7.1/src/stack.hpp	2008-03-03 22:24:25.000000000 +0100
+@@ -25,7 +25,12 @@ template<class T> class grow_stack      
+   long son;
+   long smax;
+ 
 +  /* <sigh> the max_size parameter is the number of bytes of the pointerstack
 +     instead of the number of entries which it ofcourse should have been.
 +     This breaks on 64 bit since the caller assumes 4 bytes per pointer and
 +     thus on 64 bit allocates not enough memory. Instead of fixing all callers
 +     we work around this by multiplying maxsize by 2 on 64 bit. */
-+  grow_stack(unsigned int max_size)
-+  { 
-+    max_size *= sizeof(void*)/sizeof(int);
-+    sdata = (T **)jmalloc(max_size, "pointer stack");
-+    son=0;
-+    _max_size=max_size;
-+  }
-+  
-   void push(T *data) 
-   {
-     sdata[son]=data;
-     son++;
-+    if (son >= (_max_size/sizeof(int)))
-+    {
-+      lbreak("stack overflow\n");
-+      exit(0);
-+    }
+   grow_stack(int max_size) {
+-    smax=max_size;
++    smax=max_size/sizeof(int32_t);
+     son=0;
+     sdata=(T **)jmalloc(sizeof(T *)*smax,"pointer stack");
    }
-    
--  T *pop(long total) 
--  { if (total>son) { lbreak("stack underflow\n"); exit(0); }
-+  T *pop(unsigned int total) 
-+  {
-+    if (total>son) { lbreak("stack underflow\n"); exit(0); }
-     son-=total;
-     return sdata[son];
-   }
-+
-   void clean_up() 
-   { 
-     if (son!=0) fprintf(stderr,"Warning cleaning up stack and not empty\n");
-diff -ur abuse_sdl-0.7.0.orig/src/light.cpp abuse_sdl-0.7.0/src/light.cpp
---- abuse_sdl-0.7.0.orig/src/light.cpp	2006-08-16 16:56:33.000000000 +0200
-+++ abuse_sdl-0.7.0/src/light.cpp	2006-08-16 16:36:07.000000000 +0200
-@@ -348,7 +348,7 @@
- //      f->write(green_light,256*64);
- 			for (int i=0;i<TTINTS;i++)
- 				f->write(tints[i],256);
--			fp->write(bright_tint,256);
-+			f->write(bright_tint,256);
- //    f.write(trans_table,256*256);
- 		}
- 		delete f;


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abuse/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2006 05:27:25 -0000	1.2
+++ sources	4 Mar 2008 09:41:07 -0000	1.3
@@ -1 +1 @@
-59ea4498886642aa975f04233cc92558  abuse_sdl-0.7.0.tar.bz2
+439b607f291560a8f9698a2f09cffa63  abuse-0.7.1.tar.gz


--- abuse_sdl-0.7.0-debian.patch DELETED ---