rpms/java-1.6.0-openjdk/F-13 java-1.6.0-openjdk.spec,1.153,1.154

[Martin Matejovic]

Author: mmatejov

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22298

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:

* Tue Jun 8 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-39.b18
- Added icedtea6-1.8
- Added openjdk b18
- Added visualvm_122
- Added netbeans-profiler-visualvm_release68_1.tar.gz
- Added jdk6-jaf-%{jafdate}.zip as SOURCE9
- Added jdk6-jaxp-%{jaxpdate}.zip as SOURCE10
- Added jdk6-jaxws-%{jaxwsdate}.zip as SOURCE11
- Added java-1.6.0-openjdk-visualvm-update.patch
- Removed java-1.6.0-openjdk-securitypatches-20100323.patch
- Removed java-1.6.0-openjdk-linux-globals.patch
- Removed java-1.6.0-openjdk-memory-barriers.patch
- Resolved: rhbz#595191
- Resovles: rhbz#596850
- Resolves: rhbz#597134
- Resolves: rhbz#580432



Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-13/java-1.6.0-openjdk.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- java-1.6.0-openjdk.spec	28 May 2010 08:36:02 -0000	1.153
+++ java-1.6.0-openjdk.spec	8 Jun 2010 08:06:24 -0000	1.154
@@ -834,6 +834,8 @@ if [ $1 -gt 1 ]
 then
   alternatives --remove %{javaplugin} \
     %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so 2>/dev/null  	
+  alternatives --remove %{javaplugin} \
+    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaNPPlugin.so 2>/dev/null  	
 fi
 
 
@@ -969,7 +971,7 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
-* Fri May 28 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-39.b18
+* Tue Jun 8 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-39.b18
 - Added icedtea6-1.8
 - Added openjdk b18
 - Added visualvm_122
@@ -981,6 +983,7 @@ exit 0
 - Removed java-1.6.0-openjdk-securitypatches-20100323.patch
 - Removed java-1.6.0-openjdk-linux-globals.patch
 - Removed java-1.6.0-openjdk-memory-barriers.patch
+- Resolved: rhbz#595191
 - Resovles: rhbz#596850
 - Resolves: rhbz#597134
 - Resolves: rhbz#580432