[java-1.7.0-openjdk/f18] Removed upstreamed patches

[Omair Majid]

commit d834bf573a59a9e34e333e0dff80b2b52dc11e72
Author: Omair Majid <omajid at redhat.com>
Date:   Tue Mar 5 01:02:14 2013 -0500

    Removed upstreamed patches

 java-1.7.0-openjdk.spec |   18 +-----------------
 sources                 |    1 -
 2 files changed, 1 insertions(+), 18 deletions(-)
---
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 16903d1..d82f46b 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -223,10 +223,6 @@ Source9: pulseaudio.tar.gz
 # Removed libraries that we link instead
 Source10: remove-intree-libraries.sh
 
-#This archive contains all temporal patches, which are or will be soon upstreamed,
-#but were needed asap in distribution. Those parches are then applied in loop
-Source11: tmp-patches-java-1.7.0-openjdk-f17.tar.gz
-
 # For primary arches, build latest and for secondary, use hs22
 # base (icedtea-2.2.1 tag)
 
@@ -581,7 +577,6 @@ The OpenJDK API documentation.
 
 %setup -q -c -n %{name} -T -a %{source_num}
 %setup -q -n %{name} -T -D -a 1
-%setup -q -n %{name} -T -D -a 11
 cp %{SOURCE2} .
 
 # OpenJDK patches
@@ -640,18 +635,6 @@ tar xzf %{SOURCE9}
 # Extract desktop files
 tar xzf %{SOURCE7}
 
-#apply all patches from tmp-patches
-TMPPATCHES=`ls tmp-patches/` ;
-for TP in $TMPPATCHES ; do
-  echo "using patch $TP" ;
-  patch -p1 < tmp-patches/$TP ;
-  r=$? ;
-  if [ "$r" != "0" ] ; then 
-    exit 5;
-  fi;
-done ;
-
-
 # If bootstrapping, apply additional patches
 %if %{gcjbootstrap}
 
@@ -1418,6 +1401,7 @@ exit 0
 %changelog
 * Mon Mar 4 2013 Omair Majid <omajid at redhat.com> - 1.7.0.9-2.3.8.fc18
 - Updated to icedtea7 2.3.8 (forest)
+- Remove upstreamed patches contained in extra tarball.
 
 * Fri Feb 16 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.9-2.3.7.fc18
 - Updated to 2.3.7 icedtea7 tarball
diff --git a/sources b/sources
index 61f4b82..1aa1e64 100644
--- a/sources
+++ b/sources
@@ -4,6 +4,5 @@ ea344cc5b53b73f375558ba41760ff64  class-rewriter.tar.gz
 c12f124672a97c7491530fed2c0facdc  java-access-bridge-1.23.0.tar.bz2
 1cb61996cf5dbe80827abbe7d009bf28  pulseaudio.tar.gz
 8eb5ad93dbf2f4fe86e52631969cfb09  systemtap-tapset.tar.gz
-c5e790214585959e0d9f51fb5d9e98c6  tmp-patches-java-1.7.0-openjdk-f17.tar.gz
 4b91ceff3ee6c3852d8a5af5a88b8fcd  openjdk-icedtea-2.1.6.tar.gz
 c617fc0d47cf70f2183aae5e984e8cab  openjdk-icedtea-2.3.8.tar.gz