From 75ece070e616cf050375ced4d01b4481d32e2028 Mon Sep 17 00:00:00 2001
From: Hans de Goede <jwrdegoede@fedoraproject.org>
Date: Apr 15 2008 12:22:51 +0000
Subject: - New upstream release 1.8.5


---

diff --git a/.cvsignore b/.cvsignore
index 1bae5d1..10cc3fb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-plib-1.8.4.tar.gz
+plib-1.8.5.tar.gz
diff --git a/plib-1.8.4-extraqualif.patch b/plib-1.8.4-extraqualif.patch
deleted file mode 100644
index 4d1329a..0000000
--- a/plib-1.8.4-extraqualif.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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-1.8.4-js.patch b/plib-1.8.4-js.patch
deleted file mode 100644
index 1017dc8..0000000
--- a/plib-1.8.4-js.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- plib-1.8.4/src/js/jsLinuxOld.cxx~	2006-06-03 20:00:00.000000000 +0200
-+++ plib-1.8.4/src/js/jsLinuxOld.cxx	2006-06-03 20:00:00.000000000 +0200
-@@ -27,7 +27,7 @@
- 
- #include <linux/joystick.h>
- 
--#if !defined(JS_VERSION) || JS_VERSION >= 0x010000
-+#if !defined(JS_VERSION) || JS_VERSION < 0x010000
- 
- #include <fcntl.h>
- #include <sys/ioctl.h>
diff --git a/plib.spec b/plib.spec
index dab4c8c..e8c0270 100644
--- a/plib.spec
+++ b/plib.spec
@@ -1,14 +1,12 @@
 Name:           plib
-Version:        1.8.4
-Release:        10%{?dist}
+Version:        1.8.5
+Release:        1%{?dist}
 Summary:        Set of portable libraries especially useful for games
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://plib.sourceforge.net/
 Source:         http://plib.sourceforge.net/dist/plib-%{version}.tar.gz
-Patch0:         plib-1.8.4-extraqualif.patch
 Patch1:         plib-1.8.4-fullscreen.patch
-Patch2:         plib-1.8.4-js.patch
 Patch3:         plib-1.8.4-autorepeat.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  freeglut-devel libpng-devel libXext-devel libXi-devel
@@ -35,9 +33,7 @@ or compile programs that use plib.
 
 %prep
 %setup -q
-%patch0 -p1 -b .extraqualif
 %patch1 -p1 -b .fs
-%patch2 -p1 -b .js
 %patch3 -p1 -b .autorepeat
 # for some reason this file has its x permission sets, which makes rpmlint cry
 chmod -x src/sg/sgdIsect.cxx
@@ -105,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 13 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 1.8.5-1
+- New upstream release 1.8.5
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.8.4-10
 - Autorebuild for GCC 4.3
 
@@ -121,7 +120,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Sat Jun 10 2006 Hans de Goede <j.w.r.degoede@hhs.nl> 1.8.4-6
 - Remove use of conditional BuildReqs dependent on %%fedora, this breaks
-  when people try to rebuild the SRPM and don't have %fedora defined.
+  when people try to rebuild the SRPM and don't have %%fedora defined.
   (Instead hardcode the correct BR's per Fedora Release).
 
 * Mon Jun  5 2006 Hans de Goede <j.w.r.degoede@hhs.nl> 1.8.4-5
diff --git a/sources b/sources
index 02c1a29..a97a15a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e3f289a9d1c5de0b1cfdec76bf139e6  plib-1.8.4.tar.gz
+47a6fbf63668c1eed631024038b2ea90  plib-1.8.5.tar.gz