[java-1.6.0-openjdk/f13/master] * Mon Jul 26 2010 Martin Matejovic <mmatejov at redhat.com> -1:1.6.0-42.b18 - Imports icedtea6-1.8.1 -

[Martin Matejovic]

commit 602dfac2e1af6e6ee77efffd02d1681fc5b3a952
Author: Martin Matejovic <mmatejov at redhat.com>
Date:   Wed Aug 4 16:34:27 2010 +0200

    * Mon Jul 26 2010 Martin Matejovic <mmatejov at redhat.com> -1:1.6.0-42.b18
    - Imports icedtea6-1.8.1
    - Removed: java-1.6.0-openjdk-plugin.patch
    - Resolves: rhbz#616893
    - Resolves: rhbz#616895

 .gitignore              |    2 +-
 java-1.6.0-openjdk.spec |   14 ++++++++------
 sources                 |    2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7638948..f6faf0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,9 @@ mauve_tests
 mauve-2008-10-22.tar.gz
 java-access-bridge-1.23.0.tar.bz2
 openjdk-6-src-b18-16_feb_2010-fedora.tar.gz
-icedtea6-1.8.tar.gz
 jdk6-jaf-2009_10_27.zip
 jdk6-jaxp-2009_10_13.zip
 jdk6-jaxws-2009_10_27.zip
 netbeans-profiler-visualvm_release68_1.tar.gz
 visualvm_122-src.tar.gz
+icedtea6-1.8.1.tar.gz
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index 51f2c49..df6c36c 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -6,7 +6,7 @@
 # If runtests is 0 test suites will not be run.
 %define runtests 0
 
-%define icedteaver 1.8
+%define icedteaver 1.8.1
 %define icedteasnapshot %{nil}
 %define openjdkver b18
 %define openjdkdate 16_feb_2010
@@ -143,7 +143,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 41.%{openjdkver}%{?dist}
+Release: 42.%{openjdkver}%{?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
@@ -166,9 +166,7 @@ Source3:  %{genurl}generate-fedora-zip.sh
 Source4:  README.src
 Source5:  mauve-%{mauvedate}.tar.gz
 Source6:  mauve_tests
-#Source7: %{netbeansurl}/netbeans-profiler-visualvm_release65_mod.tar.gz
 Source7: %{netbeansurl}/netbeans-profiler-visualvm_release68_1.tar.gz
-#Source8: %{visualvmurl}/visualvm-111-src.tar.gz
 Source8: %{visualvmurl}/visualvm_122-src.tar.gz
 Source9: %{jafurl}jdk6-jaf-%{jafdate}.zip
 Source10: %{jaxpurl}jdk6-jaxp-%{jaxpdate}.zip
@@ -183,7 +181,6 @@ 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:   java-1.6.0-openjdk-visualvm-update.patch
-Patch6:   java-1.6.0-openjdk-plugin.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -394,7 +391,6 @@ The OpenJDK web browser plugin.
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
 %patch5
-%patch6
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 cp %{SOURCE7} .
@@ -969,6 +965,12 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Mon Jul 26 2010 Martin Matejovic <mmatejov at redhat.com> -1:1.6.0-42.b18
+- Imports icedtea6-1.8.1
+- Removed: java-1.6.0-openjdk-plugin.patch
+- Resolves: rhbz#616893
+- Resolves: rhbz#616895
+
 * Mon Jun 14 2010 Martin Matejovic <mmatejov at redhat.com> -1:1.6.0.-41.b18
 - Fixed plugin update to IcedTeaPlugin.so
 - Fixed plugin cpu usage issue
diff --git a/sources b/sources
index 7f34967..fb67e91 100644
--- a/sources
+++ b/sources
@@ -2,9 +2,9 @@
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 c12f124672a97c7491530fed2c0facdc  java-access-bridge-1.23.0.tar.bz2
 8605eab6f3b728939a0c689e51a2ba14  openjdk-6-src-b18-16_feb_2010-fedora.tar.gz
-e08dd0762749fb50ec6c273c366ee8ae  icedtea6-1.8.tar.gz
 7a50bb540a27cdd0001885630088b758  jdk6-jaf-2009_10_27.zip
 a2f7b972124cd776ff71e7754eb9a429  jdk6-jaxp-2009_10_13.zip
 3ea5728706169498b722b898a1008acf  jdk6-jaxws-2009_10_27.zip
 517b66f76914970569a8add1ee96bcaf  netbeans-profiler-visualvm_release68_1.tar.gz
 f1e2525ddcd5fdf97bcf891d715c08ff  visualvm_122-src.tar.gz
+72d44286d16c948c7b3bb3d545200b76  icedtea6-1.8.1.tar.gz