rpms/java-1.6.0-openjdk/F-12 java-1.6.0-openjdk.spec,1.144,1.145

[Martin Matejovic]

Author: mmatejov

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

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

* Tue Mar 2 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-35.b17
- Added icedtea6-1.7.1
- Resolves: rhbz#542586
- Resolves: rhbz#568640
- Resolves: rhbz#567228
- Resolves: rhbz#539971
- Resolves: rhbz#555503
- Resolves: rhbz#523651
- Resolves: rhbz#500077
- Resolves: rhbz#475892



Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-12/java-1.6.0-openjdk.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -p -r1.144 -r1.145
--- java-1.6.0-openjdk.spec	2 Mar 2010 13:59:10 -0000	1.144
+++ java-1.6.0-openjdk.spec	3 Mar 2010 16:18:34 -0000	1.145
@@ -574,7 +574,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 IcedTeaNPPlugin.so \
+  | grep -v IcedTeaPlugin.so \
   | sed 's|'$RPM_BUILD_ROOT'||' \
   >> %{name}.files
 # Find demo directories.
@@ -816,13 +816,11 @@ if [ $1 -gt 1 ]
 then
   alternatives --remove %{javaplugin} \
     %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so 2>/dev/null
-  alternatives --remove %{javaplugin} \
-    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so
 fi
 
 alternatives \
   --install %{syslibdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
-  %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaNPPlugin.so %{priority}
+  %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so %{priority}
 
 exit 0
 
@@ -830,7 +828,7 @@ exit 0
 if [ $1 -eq 0 ]
 then
   alternatives --remove %{javaplugin} \
-    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaNPPlugin.so
+    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so
 fi
 
 exit 0
@@ -946,12 +944,11 @@ exit 0
 
 %files plugin
 %defattr(-,root,root,-)
-%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaNPPlugin.so
+%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
 * Tue Mar 2 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-35.b17
 - Added icedtea6-1.7.1
-- Added IcedTeaNPPlugin
 - Resolves: rhbz#542586
 - Resolves: rhbz#568640
 - Resolves: rhbz#567228