[java-1.6.0-openjdk] updated changelog, removed unused patches

[jiri vanek]

commit 9c61cd7f7c98a002ef748dfe28ecc380ac9ff256
Author: Jiri Vanek work <jvanek at judovana.home>
Date:   Tue Jan 31 18:21:17 2012 +0100

    updated changelog, removed unused patches

 Compiler-gcc.diff         |   16 ---
 Defs-linux.diff           |   19 ----
 glibc-name-clash.patch    |  236 ---------------------------------------------
 hotspotGccWerrors.aptch   |   32 ------
 icedtea.patch.patch       |   15 ---
 java-1.6.0-openjdk.spec   |   30 +++---
 makefile-xalan-deps.patch |   11 --
 7 files changed, 15 insertions(+), 344 deletions(-)
---
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index 5c068f8..bf589ed 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: 64.%{icedteaver}%{?dist}
+Release: 65.%{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
@@ -172,12 +172,6 @@ Patch1:   java-1.6.0-openjdk-java-access-bridge-tck.patch
 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
-#Patch7:   icedtea.patch.patch
-#Patch8:   Defs-linux.diff
-Patch9:	  hotspotGccWerrors.aptch
-Patch10:  Compiler-gcc.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -375,9 +369,6 @@ export ARCH_DATA_MODEL=64
 export CFLAGS="$CFLAGS -mieee"
 %endif
 
-#patch -l -p0 < %{PATCH5}
-#patch -l -p0 < %{PATCH7}
-
 ./autogen.sh
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
   --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
@@ -391,10 +382,6 @@ make stamps/patch-ecj.stamp
 make patch
 patch -l -p0 < %{PATCH3}
 patch -l -p0 < %{PATCH4}
-#patch -l -p0 < %{PATCH6}
-#patch -l -p0 < %{PATCH8}
-patch -l -p0 < %{PATCH9}
-patch -l -p0 < %{PATCH10}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -900,7 +887,20 @@ exit 0
 %doc %{_javadocdir}/%{name}
 
 %changelog
-* Tue Jan 30 2012 Jiri Vanek <jvanek at redhat.com> - 1:1.6.0.0-64.1.11pre
+* Tue Jan 31 2012 Jiri Vanek <jvanek at redhat.com> - 1:1.6.0.0-65.1.11
+- IcedTea6 bumped to 1.11 release
+- full release info at:
+  http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-January/017060.html
+- removed and deleted patches:
+     patch5  makefile-xalan-deps.patch
+     patch6  glibc-name-clash.patch
+     patch7  icedtea.patch.patch
+     patch8  Defs-linux.diff
+     patch9  hotspotGccWerrors.aptch
+     patch10 Compiler-gcc.diff
+   all were upstreamed
+
+* Mon Jan 30 2012 Jiri Vanek <jvanek at redhat.com> - 1:1.6.0.0-64.1.11pre
 - IcedTea6 bumped to icedtea6 1.11 series
 - Removed HotSpot source
 - Updated to jaxp144_03.zip jdk6-jaxws2_1_6-2011_06_13.zip and