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

[Martin Matejovic]

commit bb17326a18cf932fef6a9e80b48a90c05e62d99d
Author: Martin <mmatejov at localhost.localdomain>
Date:   Wed Aug 4 16:11:13 2010 +0200

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

 .gitignore                      |    1 +
 java-1.6.0-openjdk-plugin.patch |   54 ---------------------------------------
 java-1.6.0-openjdk.spec         |   12 ++++++---
 sources                         |    2 +-
 4 files changed, 10 insertions(+), 59 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6172cc1..026271f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ icedtea6-1.8.tar.gz
 jdk6-jaf-2009_10_27.zip
 jdk6-jaxp-2009_10_13.zip
 jdk6-jaxws-2009_10_27.zip
+icedtea6-1.8.1.tar.gz
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index 6b16615..3dc8c8a 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 1
 
-%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: 39.%{openjdkver}%{?dist}
+Release: 40.%{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
@@ -180,7 +180,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:   java-1.6.0-openjdk-plugin.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -391,7 +390,6 @@ The OpenJDK web browser plugin.
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 5
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
-%patch5
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 cp %{SOURCE7} .
@@ -964,6 +962,12 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog 
+* Mon Jul 26 2010 Martin Matejovic <mmatejov at redhat.com> -1:1.6.0-40.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.-39.b18
 - Fixed plugin update to IcedTeaPlugin.so
 - Fixed plugin cpu usage issue
diff --git a/sources b/sources
index b7330ec..13e34a5 100644
--- a/sources
+++ b/sources
@@ -4,7 +4,7 @@ a6756a62291ebea5c0e2431389b31380  netbeans-profiler-visualvm_release65_mod.tar.g
 a289739f4a5bcdb9a2c642cfcc1e83fe  visualvm-111-src.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
+72d44286d16c948c7b3bb3d545200b76  icedtea6-1.8.1.tar.gz
 a2f7b972124cd776ff71e7754eb9a429  jdk6-jaxp-2009_10_13.zip
 3ea5728706169498b722b898a1008acf  jdk6-jaxws-2009_10_27.zip