[java-1.6.0-openjdk] removed patch6

jiri vanek jvanek at fedoraproject.org
Tue Jan 24 16:08:54 UTC 2012


commit 8623e6fc76f2b3b828f88952862e25e24f5424c4
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Tue Jan 24 17:09:18 2012 +0100

    removed patch6

 java-1.6.0-openjdk.spec |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index ee682cd..103e7fc 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -175,7 +175,7 @@ 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
 Patch5:   makefile-xalan-deps.patch
-Patch6:   glibc-name-clash.patch
+#Patch6:   glibc-name-clash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -387,7 +387,7 @@ make stamps/patch-ecj.stamp
 make patch
 patch -l -p0 < %{PATCH3}
 patch -l -p0 < %{PATCH4}
-patch -l -p0 < %{PATCH6}
+#patch -l -p0 < %{PATCH6}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -903,6 +903,7 @@ exit 0
     S7103725, RH767129: REGRESSION – 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA
     S6851973, PR830: ignore incoming channel binding if acceptor does not set one
     S7091528, javadoc attempts to parse .class files
+-removed patch6
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.6.0.0-62.1.10.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild


More information about the scm-commits mailing list