This is a fix for
6782196, Update symlink to use new Java Plug-In
- Dermot
Index: SUNWjre-config.spec
===================================================================
--- SUNWjre-config.spec (revision 16900)
+++ SUNWjre-config.spec (working copy)
@@ -1,9 +1,9 @@
-
+#
# spec file for package SUNWjre-config
#
# includes module(s): j2re-config
#
-# Copyright (c) 2004 Sun Microsystems, Inc.
+# Copyright (c) 2008 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -14,7 +14,7 @@
%use j2re_int = j2re-integration.spec
%define plugin_dir %{_libdir}/firefox/plugins
-%define ns_plug_ver ns7
+%define plugin_file libnpjp2.so
%ifarch i386
%define myarch i386
@@ -33,8 +33,8 @@
SUNW_Copyright: %{name}.copyright
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
-BuildRequires: SUNWfirefox
-Requires: SUNWj5rt
+BuildRequires: SUNWfirefox
+Requires: SUNWj6rt
%package plugin
Summary: %{summary} - plugin
@@ -55,14 +55,14 @@
#setup mozilla plugin
#create dummy plugin
-install --mode=755 -d
${RPM_BUILD_ROOT}%{_prefix}/java/jre/plugin/%{myarch}/%{ns_plug_ver}/
-touch
${RPM_BUILD_ROOT}%{_prefix}/java/jre/plugin/%{myarch}/%{ns_plug_ver}/libjavaplugin_oji.so
+install --mode=755 -d ${RPM_BUILD_ROOT}%{_prefix}/java/jre/lib/%{myarch}/
+touch ${RPM_BUILD_ROOT}%{_prefix}/java/jre/lib/%{myarch}/%{plugin_file}
install --mode=755 -d ${RPM_BUILD_ROOT}%{plugin_dir}
cd ${RPM_BUILD_ROOT}%{plugin_dir}
-mkdir -p ../../../java/jre/plugin/%{myarch}/%{ns_plug_ver}
-touch
../../../java/jre/plugin/%{myarch}/%{ns_plug_ver}/libjavaplugin_oji.so
-ln -s
../../../java/jre/plugin/%{myarch}/%{ns_plug_ver}/libjavaplugin_oji.so .
-rm ../../../java/jre/plugin/%{myarch}/%{ns_plug_ver}/libjavaplugin_oji.so
+mkdir -p ../../../java/jre/lib/%{myarch}
+touch ../../../java/jre/lib/%{myarch}/%{plugin_file}
+ln -s ../../../java/jre/lib/%{myarch}/%{plugin_file} .
+rm ../../../java/jre/lib/%{myarch}/%{plugin_file}
rm -rf $RPM_BUILD_ROOT%{_prefix}/java
@@ -75,10 +75,12 @@
%files plugin
%defattr (-, root, bin)
%dir %attr (0755, root, bin) %{_libdir}
-%{plugin_dir}/libjavaplugin_oji.so
+%{plugin_dir}/%{plugin_file}
%changelog
+* Wed Dec 10 2008 - dermot.mccluskey at sun.com
+- 6782196, use new Java plugin
* Sun Jun 11 2006 - laca at sun.com
- change group from other to bin/sys
* Fri Jun 09 2006 - dermot.mccluskey at sun.com
