From d5edef3cf3481e3bd39482ade5af8ca3d56cdadc Mon Sep 17 00:00:00 2001
From: Bruno Wolff III <bruno@wolff.to>
Date: Apr 05 2012 03:48:30 +0000
Subject: Remove patch that is upstreamed


---

diff --git a/vegastrike-0.5.1-gcc46.patch b/vegastrike-0.5.1-gcc46.patch
deleted file mode 100644
index 63e874d..0000000
--- a/vegastrike-0.5.1-gcc46.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- src/cmd/ai/aggressive.cpp.orig	2011-07-09 10:16:05.230676774 -0500
-+++ src/cmd/ai/aggressive.cpp	2011-07-09 10:17:43.826207759 -0500
-@@ -27,6 +27,8 @@
- #include "faction_generic.h"
- #include "docking.h"
- 
-+extern double aggfire;
-+
- using namespace Orders;
- 
- const EnumMap::Pair element_names[] = {
-@@ -1608,7 +1610,6 @@
- {
-     if (parent == uoi)
-         printf( "kewl" );
--    extern double aggfire;
-     jump_time_check++;     //just so we get a nicely often wrapping var;
-     jump_time_check %= 5;
-     Flightgroup  *fg  = parent->getFlightgroup();
---- src/cmd/ai/fire.cpp.orig	2011-07-09 10:18:45.272017206 -0500
-+++ src/cmd/ai/fire.cpp	2011-07-09 10:19:30.139719659 -0500
-@@ -15,6 +15,9 @@
- #include "lin_time.h" //DEBUG ONLY
- #include "cmd/pilot.h"
- 
-+extern int numprocessed;
-+extern double targetpick;
-+
- static bool NoDockWithClear()
- {
-     static bool nodockwithclear = XMLSupport::parse_bool( vs_config->getVariable( "physics", "dock_with_clear_planets", "true" ) );
-@@ -430,8 +433,6 @@
- {
-     float gunspeed, gunrange, missilerange;
-     parent->getAverageGunSpeed( gunspeed, gunrange, missilerange );
--    extern int    numprocessed;
--    extern double targetpick;
-     static float  targettimer = UniverseUtil::GetGameTime();    //timer used to determine passage of physics frames
-     static float  mintimetoswitch =
-         XMLSupport::parse_float( vs_config->getVariable( "AI", "Targetting", "MinTimeToSwitchTargets", "3" ) );
---- src/gfxlib.h.orig	2011-07-09 11:02:39.134767618 -0500
-+++ src/gfxlib.h	2011-07-09 11:03:09.473623529 -0500
-@@ -37,6 +37,7 @@
-  * #include <GL/glut.h>
-  * #endif
-  #endif*/
-+#include <cstddef>
- #include <vector>
- class Matrix;
- 
---- src/cmd/collection.h.orig	2011-07-09 11:58:31.880884408 -0500
-+++ src/cmd/collection.h	2011-07-09 11:59:09.692690095 -0500
-@@ -14,6 +14,7 @@
- #elif defined (USE_STL_COLLECTION)
- 
- #include <list>
-+#include <cstddef>
- #include <vector>
- 
- class Unit;
diff --git a/vegastrike.spec b/vegastrike.spec
index 7fcac26..5105a48 100644
--- a/vegastrike.spec
+++ b/vegastrike.spec
@@ -20,7 +20,6 @@ Patch5:         vegastrike-0.5.1-openal.patch
 Patch6:         vegastrike-0.5.1-sys-python.patch
 Patch8:         vegastrike-0.5.1-gcc44.patch
 Patch9:         vegastrike-0.5.0-glext.patch
-Patch11:        vegastrike-0.5.1-gcc46.patch
 Patch12:        vegastrike-0.5.1-boost146.patch
 Patch13:        vegastrike-libpng15.patch
 Patch14:        vegastrike-0.5.1-gcc47.patch
@@ -49,7 +48,6 @@ Yet danger lurks in the space beyond.
 %patch6 -p0
 %patch8 -p0
 %patch9 -p1
-%patch11 -p0
 %patch12 -p0
 %patch13 -z libpng
 %patch14 -p1