rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.139,1.140

[Martin Matejovic]

Author: mmatejov

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4882

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
Fixed npplugin in spec file
CV: ----------------------------------------------------------------------



Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- java-1.6.0-openjdk.spec	29 Jan 2010 16:35:26 -0000	1.139
+++ java-1.6.0-openjdk.spec	29 Jan 2010 17:17:56 -0000	1.140
@@ -21,6 +21,7 @@
 
 %define visualvmurl https://visualvm.dev.java.net/files/documents/7163/127170/
 %define netbeansurl http://icedtea.classpath.org/visualvm/
+%define hotspoturl  http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/
 
 %define openjdkurlbase http://www.java.net/download/openjdk/jdk6/promoted/
 %define openjdkurl %{openjdkurlbase}%{openjdkver}/
@@ -581,7 +582,7 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
 # Find JRE files.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \
   | grep -v jre/lib/security \
-  | grep -v IcedTeaPlugin.so \
+  | grep -v IcedTeaNPPlugin.so \
   | sed 's|'$RPM_BUILD_ROOT'||' \
   >> %{name}.files
 # Find demo directories.
@@ -827,7 +828,7 @@ fi
 
 alternatives \
   --install %{syslibdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
-  %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so %{priority}
+  %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaNPPlugin.so %{priority}
 
 exit 0
 
@@ -835,7 +836,7 @@ exit 0
 if [ $1 -eq 0 ]
 then
   alternatives --remove %{javaplugin} \
-    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so
+    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaNPPlugin.so
 fi
 
 exit 0
@@ -953,14 +954,13 @@ exit 0
 
 %files plugin
 %defattr(-,root,root,-)
-%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
+%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaNPPlugin.so
 
 %changelog
 * Fri Jan 29 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-34.b17
 - Added icedtea6-1.7
 - Added openjdk b17
 - npplugin enabled
-- Removed: hotspot.tar.gz
 - Removed: java-1.6.0-openjdk-netbeans.patch
 - Removed: java-1.6.0-openjdk-securitypatches-20091103.patch
 - Removed: java-1.6.0-openjdk-sparc-fixes.patch