rpms/ppracer/devel ppracer-0.3.1-c++.patch, NONE, 1.1 ppracer.spec, 1.12, 1.13

[Nils Philippsen (nphilipp)]

Author: nphilipp

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

Modified Files:
	ppracer.spec 
Added Files:
	ppracer-0.3.1-c++.patch 
Log Message:
fix build requirements, C++ member declaration (#177901)


ppracer-0.3.1-c++.patch:

--- NEW FILE ppracer-0.3.1-c++.patch ---
--- ppracer-0.3.1/src/ppgltk/FT/FTTextureGlyph.h.c++	2005-02-18 11:16:04.000000000 +0100
+++ ppracer-0.3.1/src/ppgltk/FT/FTTextureGlyph.h	2006-01-16 14:03:41.000000000 +0100
@@ -52,7 +52,7 @@
          * Reset the currently active texture to zero to get into a known state before
          * drawing a string. This is to get round possible threading issues.
          */
-        static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;}
+        static void ResetActiveTexture(){ activeTextureID = 0;}
         
     private:
         /**


Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ppracer.spec	16 Mar 2005 12:27:22 -0000	1.12
+++ ppracer.spec	16 Jan 2006 13:15:54 -0000	1.13
@@ -1,12 +1,13 @@
 %define desktop_file_utils_version 0.2.90
 %define desktop_vendor fedora
 
-#define srcextraversion -2
+# Use --without modular_x to rebuild without modular X deps
+%define _modular_x 0%{!?_without_modular_x:1}
 
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 4
+Release: 5
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
@@ -17,14 +18,27 @@
 
 Patch0: PPRacer-0.1.9-ia64.patch
 Patch1: ppracer-0.3.1-lib64.patch
+Patch2: ppracer-0.3.1-c++.patch
 
+%if %_modular_x
+BuildRequires: libICE-devel
+BuildRequires: libSM-devel
+BuildRequires: libX11-devel
+BuildRequires: libXi-devel
+BuildRequires: libXext-devel
+BuildRequires: libXmu-devel
+BuildRequires: libXt-devel
+%else
 BuildRequires: xorg-x11-devel
+%endif
+BuildRequires: libGL-devel
 BuildRequires: SDL-devel >= 1.2
 BuildRequires: SDL_mixer-devel >= 1.2
 BuildRequires: tcl-devel >= 8.4.9
 BuildRequires: autoconf
 BuildRequires: freetype-devel
 BuildRequires: libpng-devel
+BuildRequires: zlib-devel
 
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 
@@ -40,6 +54,7 @@
 %setup -q
 %patch0 -p1 -b .ia64
 %patch1 -p1 -b .lib64
+%patch2 -p1 -b .c++
 
 %build
 autoconf
@@ -69,6 +84,9 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* Mon Jan 16 2006 Nils Philippsen <nphilipp at redhat.com>
+- fix build requirements, C++ member declaration (#177901)
+
 * Wed Mar 16 2005 Nils Philippsen <nphilipp at redhat.com>
 - look in .../lib64 as well for tclConfig.sh