java-1.6.0-sun: use libnpjp2.so for browser plugin instead of libjavaplugin_oji.so

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2313 ec354946-7b23-47d6-9f5a-488ba84defc7

nonfree/java-1.6.0-sun/java-1.6.0-sun-vl.spec

@@ -26,10 +26,11 @@
 
 %ifarch %{ix86}
 %define        target_cpu       i586
-%define        pluginname       %{_jvmdir}/%{jredir}/plugin/i386/ns7/libjavaplugin_oji.so
+%define        pluginname       %{_jvmdir}/%{jredir}/lib/i386/libnpjp2.so
 %endif
 %ifarch x86_64
 %define        target_cpu       amd64
+%define        pluginname       %{_jvmdir}/%{jredir}/lib/amd64/libnpjp2.so
 %endif
 
 %define        cgibindir        %{_var}/www/cgi-bin
@@ -43,7 +44,7 @@
 
 Name:           java-%{javaver}-%{origin}
 Version:        %{javaver}.%{buildver}
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        Java Runtime Environment for %{name}
 Summary(ja):    Java 実行環境 (%{name})
 License:        Operating System Distributor License for Java (DLJ)
@@ -354,12 +355,15 @@ find %{buildroot}%{_jvmdir}/%{jredir} -type f -o -type l \
 
 grep plugin  %{name}-%{version}-all.files | sort \
 > %{name}-%{version}-plugin.files
+grep npjp2  %{name}-%{version}-all.files | sort \
+>> %{name}-%{version}-plugin.files
 grep Jdbc    %{name}-%{version}-all.files | sort \
 > %{name}-%{version}-jdbc.files
 grep -F alsa.so %{name}-%{version}-all.files | sort \
 > %{name}-%{version}-alsa.files
 cat %{name}-%{version}-all.files \
 | grep -v plugin \
+| grep -v npjp2 \
 | grep -v Jdbc \
 | grep -v lib/fonts \
 | grep -vF alsa.so \
@@ -451,11 +455,11 @@ if ! [ -e %{_bindir}/javac ]; then
 fi
 
 %post plugin
-update-alternatives --install %{_libdir}/mozilla/plugins/libjavaplugin_jni.so libjavaplugin_jni.so %{pluginname} %{priority}
+update-alternatives --install %{_libdir}/mozilla/plugins/libnpjp2.so libnpjp2.so %{pluginname} %{priority}
 
 %postun plugin
 if ! [ -e "%{pluginname}" ]; then
-    update-alternatives --remove libjavaplugin_jni.so %{pluginname}
+    update-alternatives --remove libnpjp2.so %{pluginname}
 fi
 
 %postun
@@ -512,8 +516,8 @@ if ! [ -e %{_bindir}/javac ]; then
 fi
 
 %posttrans plugin
-if ! [ -e %{_libdir}/mozilla/plugins/libjavaplugin_jni.so ]; then
+if ! [ -e %{_libdir}/mozilla/plugins/libnpjp2.so ]; then
-	update-alternatives --auto libjavaplugin_jni.so
+	update-alternatives --auto libnpjp2.so
 fi
 
 %posttrans fonts
@@ -605,6 +609,9 @@ fi
 
 
 %changelog
+* Tue Dec 07 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.6.0.22-2
+- use libnpjp2.so for java browser plugin instead of libjavaplugin_oji.so
+
 * Mon Nov 22 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.6.0.22-1
 - update to 6u22