From 7d1125e2955f53da09a7daed24a3caee9adc0a1a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 07:46:12 +0000 Subject: [PATCH 01/11] Initialize branch F-11 for abuse --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 022349052bf10096dc56dcbfb400650521e8ca8a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 16:31:51 +0000 Subject: [PATCH 02/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- abuse.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abuse.spec b/abuse.spec index cd9ab92..41e14ea 100644 --- a/abuse.spec +++ b/abuse.spec @@ -1,6 +1,6 @@ Name: abuse Version: 0.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The classic Crack-Dot-Com game Group: Amusements/Games License: GPLv2+ @@ -67,6 +67,9 @@ fi %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.7.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Feb 23 2009 Fedora Release Engineering - 0.7.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 04dad840d89db34c4382f25cfb7c8f525994c43c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:38:12 +0000 Subject: [PATCH 03/11] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 96d3de3..8902d06 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := abuse SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 6b71cd03830a541797a299c47977c898be747500 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:24:33 +0000 Subject: [PATCH 04/11] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 96d3de3..8902d06 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := abuse SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 261605873938aeb2f35fa9c3201d565c2614ef20 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 22 Jun 2010 10:17:02 +0000 Subject: [PATCH 05/11] - Fix a crash when restarting the game (#592088) --- abuse-0.7.1-restart-crash-592088.patch | 11 +++++++++++ abuse.spec | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 abuse-0.7.1-restart-crash-592088.patch diff --git a/abuse-0.7.1-restart-crash-592088.patch b/abuse-0.7.1-restart-crash-592088.patch new file mode 100644 index 0000000..a053871 --- /dev/null +++ b/abuse-0.7.1-restart-crash-592088.patch @@ -0,0 +1,11 @@ +diff -up abuse-0.7.1/src/config.cpp~ abuse-0.7.1/src/config.cpp +--- abuse-0.7.1/src/config.cpp~ 2008-03-02 19:43:35.000000000 +0100 ++++ abuse-0.7.1/src/config.cpp 2010-06-22 12:17:08.780149920 +0200 +@@ -226,6 +226,7 @@ void config_cleanup() + { + jfree( key_map ); + } ++ key_map = NULL; + } + + // diff --git a/abuse.spec b/abuse.spec index 41e14ea..aa12604 100644 --- a/abuse.spec +++ b/abuse.spec @@ -1,6 +1,6 @@ Name: abuse Version: 0.7.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The classic Crack-Dot-Com game Group: Amusements/Games License: GPLv2+ @@ -67,6 +67,9 @@ fi %changelog +* Tue Jun 22 2010 Hans de Goede 0.7.1-5 +- Fix a crash when restarting the game (#592088) + * Fri Jul 24 2009 Fedora Release Engineering - 0.7.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 55665c7045c4bad4d78c4fb1d5959115e1e94cd9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:33:43 +0000 Subject: [PATCH 06/11] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8902d06..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: abuse -# $Id$ -NAME := abuse -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From e30bf580867128934cd9a16feacede656d71886e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:33:45 +0000 Subject: [PATCH 07/11] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8902d06..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: abuse -# $Id$ -NAME := abuse -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 From 375fa0fefb916537c6651391c4dfa6223f7b4e72 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:11:48 -0600 Subject: [PATCH 08/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- abuse.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abuse.spec b/abuse.spec index aa12604..19c6396 100644 --- a/abuse.spec +++ b/abuse.spec @@ -1,6 +1,6 @@ Name: abuse Version: 0.7.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The classic Crack-Dot-Com game Group: Amusements/Games License: GPLv2+ @@ -67,6 +67,9 @@ fi %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.7.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Jun 22 2010 Hans de Goede 0.7.1-5 - Fix a crash when restarting the game (#592088) From 154b02f724e38515b75c5d069d27b57327bd5872 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 14:58:34 -0600 Subject: [PATCH 09/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- abuse.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abuse.spec b/abuse.spec index 19c6396..b9b171f 100644 --- a/abuse.spec +++ b/abuse.spec @@ -1,6 +1,6 @@ Name: abuse Version: 0.7.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: The classic Crack-Dot-Com game Group: Amusements/Games License: GPLv2+ @@ -67,6 +67,9 @@ fi %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 0.7.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 0.7.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From fcf65ab148287b5af49477c4a36e1b01f08ad321 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 10:30:15 -0500 Subject: [PATCH 10/11] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- abuse.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abuse.spec b/abuse.spec index b9b171f..50dc022 100644 --- a/abuse.spec +++ b/abuse.spec @@ -1,6 +1,6 @@ Name: abuse Version: 0.7.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: The classic Crack-Dot-Com game Group: Amusements/Games License: GPLv2+ @@ -67,6 +67,9 @@ fi %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 0.7.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jan 12 2012 Fedora Release Engineering - 0.7.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From c0c0db1e7440586533670133cdc08e5bc99af055 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 17 Dec 2012 17:16:05 +0100 Subject: [PATCH 11/11] abuse's data contains the claudio addon, which turns out to contain a no-commercial use clause, and removing the addon completely break abuse, see: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648272 --- .gitignore | 1 - abuse-0.7.1-restart-crash-592088.patch | 11 --- abuse.spec | 111 ------------------------- abuse_sdl-0.7.0-exit-intro-crash.patch | 20 ----- abuse_sdl-0.7.0-fixes.patch | 18 ---- dead.package | 1 + sources | 1 - 7 files changed, 1 insertion(+), 162 deletions(-) delete mode 100644 .gitignore delete mode 100644 abuse-0.7.1-restart-crash-592088.patch delete mode 100644 abuse.spec delete mode 100644 abuse_sdl-0.7.0-exit-intro-crash.patch delete mode 100644 abuse_sdl-0.7.0-fixes.patch create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 3de2608..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -abuse-0.7.1.tar.gz diff --git a/abuse-0.7.1-restart-crash-592088.patch b/abuse-0.7.1-restart-crash-592088.patch deleted file mode 100644 index a053871..0000000 --- a/abuse-0.7.1-restart-crash-592088.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up abuse-0.7.1/src/config.cpp~ abuse-0.7.1/src/config.cpp ---- abuse-0.7.1/src/config.cpp~ 2008-03-02 19:43:35.000000000 +0100 -+++ abuse-0.7.1/src/config.cpp 2010-06-22 12:17:08.780149920 +0200 -@@ -226,6 +226,7 @@ void config_cleanup() - { - jfree( key_map ); - } -+ key_map = NULL; - } - - // diff --git a/abuse.spec b/abuse.spec deleted file mode 100644 index 50dc022..0000000 --- a/abuse.spec +++ /dev/null @@ -1,111 +0,0 @@ -Name: abuse -Version: 0.7.1 -Release: 8%{?dist} -Summary: The classic Crack-Dot-Com game -Group: Amusements/Games -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 -# 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 -a window or fullscreen and it has stereo sound with sound panning. - - -%prep -%setup -q -%patch1 -p1 -z .fix -%patch2 -p1 -z .intro - - -%build -%configure -make %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps -mv $RPM_BUILD_ROOT%{_datadir}/games/%{name}/%{name}.png \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps -rm -fr $RPM_BUILD_ROOT%{_datadir}/games - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - - -%files -%defattr(-,root,root,-) -%doc AUTHORS README TODO COPYING -%{_bindir}/%{name} -%{_mandir}/man6/%{name}.6.gz -%{_datadir}/icons/hicolor/32x32/apps/%{name}.png - - -%changelog -* Wed Jul 18 2012 Fedora Release Engineering - 0.7.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 0.7.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 0.7.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jun 22 2010 Hans de Goede 0.7.1-5 -- Fix a crash when restarting the game (#592088) - -* Fri Jul 24 2009 Fedora Release Engineering - 0.7.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Feb 23 2009 Fedora Release Engineering - 0.7.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Sep 7 2008 Hans de Goede 0.7.1-2 -- Fix patch fuzz build failure - -* Mon Mar 3 2008 Hans de Goede 0.7.1-1 -- Upstream is alive again, new upstream release 0.7.1, yeah! - -* Tue Feb 19 2008 Fedora Release Engineering - 0.7.0-6 -- Autorebuild for GCC 4.3 - -* Thu Aug 2 2007 Hans de Goede 0.7.0-5 -- Update License tag for new Licensing Guidelines compliance - -* Sun May 20 2007 Hans de Goede 0.7.0-4 -- Fix broken URL field (bz 240592) - -* Mon Aug 28 2006 Hans de Goede 0.7.0-3 -- FE6 Rebuild - -* Thu Aug 24 2006 Hans de Goede 0.7.0-2 -- Fix abuse from crashing on exit when you try to close the window while the - intro is still playing - -* Wed Aug 16 2006 Hans de Goede 0.7.0-1 -- Initial FE submission diff --git a/abuse_sdl-0.7.0-exit-intro-crash.patch b/abuse_sdl-0.7.0-exit-intro-crash.patch deleted file mode 100644 index 7c7e44a..0000000 --- a/abuse_sdl-0.7.0-exit-intro-crash.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- abuse_sdl-0.7.0/src/game.cpp.shit 2006-08-24 16:39:45.000000000 +0200 -+++ abuse_sdl-0.7.0/src/game.cpp 2006-08-24 16:43:22.000000000 +0200 -@@ -1269,9 +1269,14 @@ - if( DEFINEDP( logo_snd ) && ( sound_avail & SFX_INITIALIZED ) ) - cash.sfx( lnumber_value( logo_snd ) )->play( sfx_volume ); - -- image blank( 2, 2 ); -- blank.clear(); -- eh->set_mouse_shape( blank.copy(), 0, 0 ); // don't show mouse -+ /* This must be a dynamic allocated image because if it -+ is not and the window gets closed during do_title, then -+ exit() will try to delete (through the desctructor of -+ image_list in image.cpp) the image on the stack -> boom. */ -+ image *blank = new image( 2, 2 ); -+ blank->clear(); -+ eh->set_mouse_shape( blank->copy(), 0, 0 ); // don't show mouse -+ delete blank; - fade_in( cash.img( cdc_logo ), 32 ); - - milli_wait( 900 ); diff --git a/abuse_sdl-0.7.0-fixes.patch b/abuse_sdl-0.7.0-fixes.patch deleted file mode 100644 index 3f3cdb6..0000000 --- a/abuse_sdl-0.7.0-fixes.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up abuse-0.7.1/src/stack.hpp.foo abuse-0.7.1/src/stack.hpp ---- abuse-0.7.1/src/stack.hpp.foo 2008-09-07 15:14:12.000000000 +0200 -+++ abuse-0.7.1/src/stack.hpp 2008-09-07 15:14:18.000000000 +0200 -@@ -25,8 +25,13 @@ template class grow_stack - long son; - long smax; - -+ /* 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(int max_size) { -- smax=max_size; -+ smax=max_size/sizeof(int32_t); - son=0; - sdata=(T **)jmalloc(sizeof(T *)*smax,"pointer stack"); - } diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..9ed503f --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +abuse's data contains the claudio addon, which turns out to contain a no-commercial use clause, and removing the addon completely break abuse, see: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648272 diff --git a/sources b/sources deleted file mode 100644 index 411ed3c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -439b607f291560a8f9698a2f09cffa63 abuse-0.7.1.tar.gz