Compare commits

..

3 commits

Author SHA1 Message Date
Fedora Release Engineering
db7d52414b dist-git conversion 2010-07-28 09:33:44 +00:00
Bill Nottingham
f33e57bb84 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:24:34 +00:00
Jesse Keating
0ca8502dbf Initialize branch F-9 for abuse 2008-04-20 11:48:53 +00:00
6 changed files with 129 additions and 1 deletions

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
abuse-0.7.1.tar.gz

90
abuse.spec Normal file
View file

@ -0,0 +1,90 @@
Name: abuse
Version: 0.7.1
Release: 1%{?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
* Mon Mar 3 2008 Hans de Goede <j.w.r.degoede@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@fedoraproject.org> - 0.7.0-6
- Autorebuild for GCC 4.3
* Thu Aug 2 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.0-5
- Update License tag for new Licensing Guidelines compliance
* Sun May 20 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.0-4
- Fix broken URL field (bz 240592)
* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede@hhs.nl> 0.7.0-3
- FE6 Rebuild
* Thu Aug 24 2006 Hans de Goede <j.w.r.degoede@hhs.nl> 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 <j.w.r.degoede@hhs.nl> 0.7.0-1
- Initial FE submission

View file

@ -0,0 +1,20 @@
--- 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 );

View file

@ -0,0 +1,17 @@
--- 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(int max_size) {
- smax=max_size;
+ smax=max_size/sizeof(int32_t);
son=0;
sdata=(T **)jmalloc(sizeof(T *)*smax,"pointer stack");
}

View file

@ -1 +0,0 @@
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

1
sources Normal file
View file

@ -0,0 +1 @@
439b607f291560a8f9698a2f09cffa63 abuse-0.7.1.tar.gz