[java-1.6.0-openjdk/f16] - added patch8 revertTwoWrongSecurityPatches2013-02-06.patch to remove 6664509 and 7201064 from

[jiri vanek]

commit 50da6a2192f2959afcdddb2e7818b4f46aea0ce5
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Wed Feb 6 20:09:32 2013 +0100

    - added patch8 revertTwoWrongSecurityPatches2013-02-06.patch
      to remove   6664509 and 7201064 from 1.11.6 tarball

 java-1.6.0-openjdk.spec                       |   11 ++++++++++-
 revertTwoWrongSecurityPatches2013-02-06.patch |   19 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index b3531c6..e6a1e6b 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -138,7 +138,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 69.%{icedteaver}%{?dist}
+Release: 70.%{icedteaver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -173,6 +173,8 @@ Patch2:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
 Patch3:	  java-1.6.0-openjdk-java-access-bridge-security.patch
 Patch4:   java-1.6.0-openjdk-accessible-toolkit.patch
 
+Patch8:   revertTwoWrongSecurityPatches2013-02-06.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
@@ -388,6 +390,9 @@ make stamps/patch-ecj.stamp
 %endif
 
 make patch
+#reverting 6664509 and 7201064 from 1.11.6
+patch -p0 < %{PATCH8}
+
 patch -l -p0 < %{PATCH3}
 patch -l -p0 < %{PATCH4}
 patch -f -l -p0 < %{PATCH5} || true
@@ -899,6 +904,10 @@ exit 0
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Feb 06 2013 Jiri Vanek <jvanek at redhat.com> - 1:1.6.0.0-1.70.1.11.6
+- added patch8 revertTwoWrongSecurityPatches2013-02-06.patch
+  to remove   6664509 and 7201064 from 1.11.6 tarball
+
 * Sat Jan 15 2013 Jiri Vanek <jvanek at redhat.com> - 1:1.6.0.0-1.69.1.11.6
 - Rewritten java-1.6.0-openjdk-java-access-bridge-security.patch 
 - Updated to icedtea6 1.11.6
diff --git a/revertTwoWrongSecurityPatches2013-02-06.patch b/revertTwoWrongSecurityPatches2013-02-06.patch
new file mode 100644
index 0000000..c8ba7ae
--- /dev/null
+++ b/revertTwoWrongSecurityPatches2013-02-06.patch
@@ -0,0 +1,19 @@
+--- Makefile.am
++++ Makefile.am
+@@ -248,7 +248,6 @@
+ 	patches/security/20121016/7198606.patch \
+ 	patches/security/20130201/7201068.patch \
+ 	patches/security/20130201/6563318.patch \
+-	patches/security/20130201/6664509.patch \
+ 	patches/security/20130201/6776941.patch \
+ 	patches/security/20130201/7141694.patch \
+ 	patches/security/20130201/7173145.patch \
+@@ -262,7 +261,6 @@
+ 	patches/security/20130201/7197546.patch \
+ 	patches/security/20130201/7200491.patch \
+ 	patches/security/20130201/7200500.patch \
+-	patches/security/20130201/7201064.patch \
+ 	patches/security/20130201/7201066.patch \
+ 	patches/security/20130201/7201070.patch \
+ 	patches/security/20130201/7201071.patch \
+