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

[Martin Matejovic]

Author: mmatejov

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

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

* Mon Jun 14 2010 Martin Matejovic <mmatejov at redhat.com> -1:1.6.0.-40.b18
- Fixed plugin update to IcedTeaPlugin.so
- Resolves: rhbz#602906



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.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- java-1.6.0-openjdk.spec	8 Jun 2010 08:06:24 -0000	1.154
+++ java-1.6.0-openjdk.spec	14 Jun 2010 12:21:54 -0000	1.155
@@ -26,9 +26,7 @@
 %define jafurl      http://kenai.com/projects/jdk6-drops/downloads/download/
 %define jaxwsurl    http://kenai.com/projects/jdk6-drops/downloads/download/
 
-#%define visualvmurl https://visualvm.dev.java.net/files/documents/7163/127170/
 %define visualvmurl https://visualvm.dev.java.net/files/documents/7163/146746/
-#%define netbeansurl http://icedtea.classpath.org/visualvm/
 %define netbeansurl https://visualvm.dev.java.net/files/documents/7163/150173/
 
 %define openjdkurlbase http://www.java.net/download/openjdk/jdk6/promoted/
@@ -145,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
@@ -834,11 +832,9 @@ 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
-
-
+alternatives --remove %{javaplugin} \
+  %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaNPPlugin.so 2>/dev/null  	
 alternatives \
   --install %{syslibdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
   %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so %{priority}
@@ -971,6 +967,10 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Mon Jun 14 2010 Martin Matejovic <mmatejov at redhat.com> -1:1.6.0.-40.b18
+- Fixed plugin update to IcedTeaPlugin.so
+- Resolves: rhbz#602906
+
 * Tue Jun 8 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-39.b18
 - Added icedtea6-1.8
 - Added openjdk b18