rpms/plib/devel plib-1.8.4-extraqualif.patch, NONE, 1.1 plib.spec, 1.8, 1.9

[Matthias Saou (thias)]

Author: thias

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

Modified Files:
	plib.spec 
Added Files:
	plib-1.8.4-extraqualif.patch 
Log Message:
Rebuild for new gcc/glibc and modular X.


plib-1.8.4-extraqualif.patch:

--- NEW FILE plib-1.8.4-extraqualif.patch ---
diff -Naupr plib-1.8.4.orig/src/ssgAux/ssgaSky.h plib-1.8.4/src/ssgAux/ssgaSky.h
--- plib-1.8.4.orig/src/ssgAux/ssgaSky.h	2003-09-26 16:54:20.000000000 +0200
+++ plib-1.8.4/src/ssgAux/ssgaSky.h	2006-02-09 18:59:30.000000000 +0100
@@ -104,7 +104,7 @@ public:
   ssgaCelestialBodyList ( int init = 3 )
 	  : ssgSimpleList ( sizeof(ssgaCelestialBody*), init ) { }
 
-  ssgaCelestialBodyList::~ssgaCelestialBodyList () { removeAll(); }
+  ~ssgaCelestialBodyList () { removeAll(); }
 
   int getNum (void) { return total ; }
 
@@ -192,7 +192,7 @@ public:
   ssgaCloudLayerList ( int init = 3 )
 	  : ssgSimpleList ( sizeof(ssgaCloudLayer*), init ) { }
 
-  ssgaCloudLayerList::~ssgaCloudLayerList () { removeAll(); }
+  ~ssgaCloudLayerList () { removeAll(); }
 
   int getNum (void) { return total ; }
 


Index: plib.spec
===================================================================
RCS file: /cvs/extras/rpms/plib/devel/plib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plib.spec	27 Jun 2005 11:45:59 -0000	1.8
+++ plib.spec	9 Feb 2006 18:06:59 -0000	1.9
@@ -1,13 +1,22 @@
 Summary: Set of portable libraries especially useful for games
 Name: plib
 Version: 1.8.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://plib.sourceforge.net/
 Source: http://plib.sourceforge.net/dist/plib-%{version}.tar.gz
+Patch0: plib-1.8.4-extraqualif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, Mesa-devel, freeglut-devel, libpng-devel
+BuildRequires: gcc-c++, freeglut-devel, libpng-devel
+# 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, libXext-devel, libXi-devel, libXmu-devel
+Buildrequires: libSM-devel
+Buildrequires: mesa-libGL-devel, mesa-libGLU-devel
+%endif
 
 %description
 This is a set of OpenSource (LGPL) libraries that will permit programmers
@@ -32,6 +41,7 @@
 
 %prep
 %setup
+%patch0 -p1 -b .extraqualif
 
 
 %build
@@ -56,6 +66,10 @@
 
 
 %changelog
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 1.8.4-2
+- Rebuild for new gcc/glibc and modular X.
+- Include gcc 4.1 patch to fix extra qualification errors.
+
 * Mon Jun 27 2005 Matthias Saou <http://freshrpms.net/> 1.8.4-1
 - Update to 1.8.4.