SPECS: java-sun.spec - plugin _must_ be placed in %{jredir}/plugin...

[hawk]

Author: hawk                         Date: Tue May 16 15:29:09 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- plugin _must_ be placed in %{jredir}/plugin/i386/ns7/ or browsers
  will not use it at all

---- Files affected:
SPECS:
   java-sun.spec (1.117 -> 1.118) 

---- Diffs:

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.117 SPECS/java-sun.spec:1.118
--- SPECS/java-sun.spec:1.117	Sun May 14 20:40:42 2006
+++ SPECS/java-sun.spec	Tue May 16 17:29:03 2006
@@ -321,7 +321,9 @@
 
 %ifarch %{ix86}
 # Install plugin for browsers:
-install jre/plugin/i386/ns7/libjavaplugin_oji.so $RPM_BUILD_ROOT%{_plugindir}
+install -d $RPM_BUILD_ROOT%{jredir}/plugin/i386/ns7
+install jre/plugin/i386/ns7/libjavaplugin_oji.so $RPM_BUILD_ROOT%{jredir}/plugin/i386/ns7
+ln -sf %{jredir}/plugin/i386/ns7/libjavaplugin_oji.so $RPM_BUILD_ROOT%{_plugindir}
 
 install jre/plugin/desktop/*.desktop $RPM_BUILD_ROOT%{_desktopdir}
 install jre/plugin/desktop/*.png $RPM_BUILD_ROOT%{_pixmapsdir}
@@ -776,6 +778,8 @@
 %ifarch %{ix86}
 %files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
+%dir %{jredir}/plugin/i386/ns7
+%attr(755,root,root) %{jredir}/plugin/i386/ns7/libjavaplugin_oji.so
 %attr(755,root,root) %{_plugindir}/*.so
 %endif
 
@@ -790,6 +794,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.118  2006/05/16 15:29:03  hawk
+- plugin _must_ be placed in %{jredir}/plugin/i386/ns7/ or browsers
+  will not use it at all
+
 Revision 1.117  2006/05/14 18:40:42  blues
 - release 2 - browser plugin support
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/java-sun.spec?r1=1.117&r2=1.118&f=u