rpms/crack-attack/devel crack-attack-1.1.14-glutInit.patch, NONE, 1.1 crack-attack-1.1.14-sanitize.patch, NONE, 1.1 crack-attack.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Sun Sep 3 05:03:28 UTC 2006


Author: jwrdegoede

Update of /cvs/extras/rpms/crack-attack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29808/devel

Modified Files:
	.cvsignore sources 
Added Files:
	crack-attack-1.1.14-glutInit.patch 
	crack-attack-1.1.14-sanitize.patch crack-attack.spec 
Log Message:
auto-import crack-attack-1.1.14-8 on branch devel from crack-attack-1.1.14-8.src.rpm

crack-attack-1.1.14-glutInit.patch:

--- NEW FILE crack-attack-1.1.14-glutInit.patch ---
diff -ur crack-attack-1.1.14.vanilla/src/Attack.cxx crack-attack-1.1.14/src/Attack.cxx
--- crack-attack-1.1.14.vanilla/src/Attack.cxx	2005-05-13 21:00:02.000000000 +0200
+++ crack-attack-1.1.14/src/Attack.cxx	2006-05-04 09:56:04.000000000 +0200
@@ -83,6 +83,7 @@
   int height = -1, width = -1;
   
   player_name[0] = '\0';
+  glutInit(&argc, argv);
   parseCommandLine(argc, argv, mode, port, host_name, player_name, height, width);
   run_crack_attack(mode, port, host_name, player_name, height, width);
 

crack-attack-1.1.14-sanitize.patch:

--- NEW FILE crack-attack-1.1.14-sanitize.patch ---
--- crack-attack-1.1.14/doc/crack-attack.6~	2006-08-14 17:56:03.000000000 +0200
+++ crack-attack-1.1.14/doc/crack-attack.6	2006-08-14 17:56:03.000000000 +0200
@@ -1,7 +1,7 @@
 .TH crack-attack 6   
 .\" auto-generated from crack-attack.xml by docbook2manxml $Revision: 1.3 $ 
 .SH NAME
-crack-attack \- multiplayer OpenGL puzzle game like "Tetris Attack"
+crack-attack \- multiplayer OpenGL puzzle game
 .SH SYNOPSIS
 \fBcrack-attack\fR
 {
--- crack-attack-1.1.14/doc/index.html~	2006-08-14 17:56:50.000000000 +0200
+++ crack-attack-1.1.14/doc/index.html	2006-08-14 17:56:50.000000000 +0200
@@ -14,9 +14,6 @@
 <font size=+3>
 <br><br>
 A free OpenGL game for Linux and Windows
-<font size=+1>
-<p>based on the Super Nintendo classic
-<br>Tetris Attack
 <font size=+0>
 <p>by Daniel Nelson
 <p>
--- crack-attack-1.1.14/doc/crack-attack.xml~	2006-08-14 17:55:21.000000000 +0200
+++ crack-attack-1.1.14/doc/crack-attack.xml	2006-08-14 17:55:21.000000000 +0200
@@ -41,7 +41,7 @@
   </refmeta>
   <refnamediv id="name">
     <refname>crack-attack</refname>
-    <refpurpose>multiplayer OpenGL puzzle game like "Tetris Attack"</refpurpose>
+    <refpurpose>multiplayer OpenGL puzzle game</refpurpose>
   </refnamediv>
   <refsynopsisdiv id="synopsis">
     <cmdsynopsis>
@@ -67,8 +67,7 @@
   <refsect1 id="description">
     <title>Description</title>
     <para>
-      &package; is roughly based on the Super Nintendo game
-      "Tetris Attack".  Slowly, your stack of colored blocks grows from the
+      Slowly, your stack of colored blocks grows from the
       bottom, and you've got to make sure it never reaches the top. If it
       does, you lose. To eliminate blocks from the stack, line up at least
       three of one color, horizontally or vertically. Once you do, those


--- NEW FILE crack-attack.spec ---
Summary:        Puzzle action game
Name:           crack-attack
Version:        1.1.14
Release:        8%{?dist}
License:        GPL
Group:          Amusements/Games
URL:            http://www.nongnu.org/crack-attack/
Source0:        http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.bz2
Patch0:         crack-attack-1.1.14-glutInit.patch
Patch1:         crack-attack-1.1.14-sanitize.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libstdc++-devel desktop-file-utils ImageMagick
BuildRequires:  SDL-devel gtk2-devel pkgconfig SDL_mixer-devel freeglut-devel
BuildRequires:  mesa-libGLU-devel libXmu-devel

%description
A puzzle/action game in which you rush to eliminate colored blocks
before they fill your screen. Particularly clever eliminations cause
garbage to clutter your opponent's screen. Who will survive the
longest!? Playable both online and off.


%prep
%setup -q
perl -pi -e 's/-O3 -s//g' src/Makefile.in
perl -pi -e 's/-O2//g' src/gtk-gui/Makefile.in
%patch0 -p1 -b .glutinit
%patch1 -p1 -b .sanitize
# fixup provided desktop file
sed -i -e 's/%{name}\.xpm/%{name}\.png/' -e 's/Games/Game/' \
  data/%{name}.desktop
echo "Comment=A Puzzle Game" >> data/%{name}.desktop


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  --delete-original                             \
  $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}.desktop

mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
convert -resize 48x48 $RPM_BUILD_ROOT%{_datadir}/%{name}/logo.tga \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png


%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 doc/*.html doc/*.jpg doc/*.xpm AUTHORS COPYING README ChangeLog
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}*.desktop
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_mandir}/man6/%{name}.6.gz


%changelog
* Sun Aug 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.14-8
- Some small specfile cleanups
- Don't ship patch backup files and other cruft as docs
- Remove redundant desktop file from /usr/share/crack-attack

* Mon Aug 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.14-7
- Submit to Fedora Extras since I see no reason it cannot live there
- Install icon into /usr/share/icons, instead of /usr/share/pixmaps
- Add scriptlets to update icon cache

* Sun May 14 2006 Noa Resare <noa at resare.com> 1.1.14-6.lvn5
- Really apply the patch also

* Thu May 11 2006 Noa Resare <noa at resare.com> 1.1.14-5.lvn5
- added call to glutInit (#245)

* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field

* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist

* Sun Jan 29 2006 Adrian Reber <adrian at lisas.de> - 1.1.14-0.lvn.4
- Changed BR for modular X
- Dropped 0 Epoch
- Changed BuildRoot

* Sat Aug 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:1.1.14-0.lvn.3
- Include only one desktop menu entry for GUI version (#536).
 
* Mon Jul  4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.1.14-0.lvn.2
- Clean up obsolete pre-FC2 support.

* Tue Jun 14 2005 Dams <anvil[AT]livna.org> - 0:1.1.14-0.lvn.1
- Updated to 1.1.14
- Man page switched from section 1 to 6.

* Sat Apr 30 2005 Dams <anvil[AT]livna.org> - 0:1.1.13-0.lvn.1
- Dont strip binary
- Honor optflags

* Thu Apr 28 2005 Dams <anvil[AT]livna.org> - 0:1.1.13-0.lvn.1
- Updated to 1.1.13

* Wed Nov 17 2004 Dams <anvil[AT]livna.org> - 0:1.1.10-0.lvn.4
- Added build switch for glut/freeglut

* Tue Nov 16 2004 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0:1.1.10-0.lvn.3
- Add gcc34 patch

* Sun Jul 11 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.1.10-0.lvn.2
- Add full Source0 URL.

* Mon Dec  1 2003 Dams <anvil[AT]livna.org> 0:1.1.10-0.lvn.1
- Updated to 1.1.10

* Sun Oct  5 2003 Dams <anvil[AT]livna.org> 0:1.1.9-0.fdr.1
- Updated to 1.1.9

* Tue Sep 16 2003 Dams <anvil[AT]livna.org> 0:1.1.8-0.fdr.7
- Updated patches from Mandrake contribs (Olivier Blin's package)
- Added patch from Guillaume Cottenceau to prevent segfault with
  voodoo3 cards

* Sun Sep  7 2003 Dams <anvil[AT]livna.org> 0:1.1.8-0.fdr.6
- Added another desktop entry for extreme mode

* Mon Aug 25 2003 Dams <anvil[AT]livna.org> 0:1.1.8-0.fdr.5
- Removed gl.h patch. Added real 'fix' for ARB GL functions

* Fri Aug 22 2003 Dams <anvil[AT]livna.org> 0:1.1.8-0.fdr.3
- desktop entry and icon
- gl.h patch dependent of XFree86 version
- Compiling with RPM_OPT_FLAGS

* Fri Aug 22 2003 Dams <anvil[AT]livna.org> 0:1.1.8-0.fdr.2
- Added patch to allow build with gcc 3.3
- Fixed gl.h bug

* Tue Jul  1 2003 Dams <anvil[AT]livna.org> 
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crack-attack/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Sep 2006 05:00:25 -0000	1.1
+++ .cvsignore	3 Sep 2006 05:03:28 -0000	1.2
@@ -0,0 +1 @@
+crack-attack-1.1.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crack-attack/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Sep 2006 05:00:25 -0000	1.1
+++ sources	3 Sep 2006 05:03:28 -0000	1.2
@@ -0,0 +1 @@
+77bfcb38a293e87fd0d0eab05bae8177  crack-attack-1.1.14.tar.bz2




More information about the scm-commits mailing list