From b27e9c649162d2395e3b52b311d7d15e2d9d8d6e Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Feb 09 2006 18:06:59 +0000
Subject: Rebuild for new gcc/glibc and modular X.


---

diff --git a/plib-1.8.4-extraqualif.patch b/plib-1.8.4-extraqualif.patch
new file mode 100644
index 0000000..4d1329a
--- /dev/null
+++ b/plib-1.8.4-extraqualif.patch
@@ -0,0 +1,21 @@
+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 ; }
+ 
diff --git a/plib.spec b/plib.spec
index 7ba6f2c..033d831 100644
--- a/plib.spec
+++ b/plib.spec
@@ -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 @@ the web. All of it works well together.
 
 %prep
 %setup
+%patch0 -p1 -b .extraqualif
 
 
 %build
@@ -56,6 +66,10 @@ the web. All of it works well together.
 
 
 %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.