rpms/csmash/devel csmash-0.6.6-extraqualif.patch, NONE, 1.1 csmash.spec, 1.9, 1.10

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	csmash.spec 
Added Files:
	csmash-0.6.6-extraqualif.patch 
Log Message:
Add modular X support, patch for gcc 4.1 and rebuild for FC5 (#178666).


csmash-0.6.6-extraqualif.patch:

--- NEW FILE csmash-0.6.6-extraqualif.patch ---
diff -Naupr csmash-0.6.6.orig/BallView.h csmash-0.6.6/BallView.h
--- csmash-0.6.6.orig/BallView.h	2003-07-13 17:26:24.000000000 +0200
+++ csmash-0.6.6/BallView.h	2006-01-23 18:43:13.000000000 +0100
@@ -32,7 +32,7 @@ public:
 
   static GLuint m_number[10];
 private:
-  void BallView::DrawTargetCircle();
+  void DrawTargetCircle();
   GLUquadricObj *m_quad;
 
   void DrawBall();


Index: csmash.spec
===================================================================
RCS file: /cvs/extras/rpms/csmash/devel/csmash.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- csmash.spec	24 May 2005 17:06:14 -0000	1.9
+++ csmash.spec	23 Jan 2006 18:23:27 -0000	1.10
@@ -1,16 +1,23 @@
 Summary: 3D tabletennis game
 Name: csmash
 Version: 0.6.6
-Release: 9
+Release: 10%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://cannonsmash.sourceforge.net/
 Source: http://dl.sf.net/cannonsmash/csmash-%{version}.tar.gz
-Patch: csmash-0.6.6-64bit-gcc4-fixes.patch
+Patch0: csmash-0.6.6-64bit-gcc4-fixes.patch
+Patch1: csmash-0.6.6-extraqualif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: Mesa-devel, libjpeg-devel, zlib-devel, gtk2-devel >= 2.0.0
+BuildRequires: gtk2-devel, libjpeg-devel, zlib-devel, gcc-c++
 BuildRequires: SDL-devel >= 1.2.0, SDL_mixer-devel, SDL_image-devel
-BuildRequires: gcc-c++, desktop-file-utils
+BuildRequires: desktop-file-utils
+# Use monolithic X up to FC4, and modular X for FC5+
+%if 0%{?fedora} < 5
+BuildRequires: xorg-x11-devel, Mesa-devel
+%else
+BuildRequires: libX11-devel, mesa-libGL-devel, mesa-libGLU-devel
+%endif
 
 %description
 CannonSmash is a 3D tabletennis game. The goal of this project is to
@@ -21,7 +28,8 @@
 
 %prep
 %setup
-%patch -p1 -b .64bit-gcc4
+%patch0 -p1 -b .64bit-gcc4
+%patch1 -p1 -b .extraqualif
 
 
 %build
@@ -67,6 +75,11 @@
 
 
 %changelog
+* Mon Jan 23 2006 Matthias Saou <http://freshrpms.net/> 0.6.6-10
+- Add conditional to build with/without modular X depending on FC version.
+- Include gcc 4.1 patch to fix "extra qualification" errors.
+- For some reason, adding libXt, libXext and libXmu to the build make it fail.
+
 * Tue May 24 2005 Matthias Saou <http://freshrpms.net/> 0.6.6-9
 - Update the gcc4 patch with diff from bug #156205.