Author: hawk Date: Thu Feb 5 13:33:22 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - package old Java plugin as default one, new plugin as browser-plugin-ng (it works only with Firefox/Iceweasel 3.x), mutual O: for plugins - release 0.2, please test i686 with both old and new plugins
---- Files affected: SPECS: java-sun.spec (1.216 -> 1.217) ---- Diffs: ================================================================ Index: SPECS/java-sun.spec diff -u SPECS/java-sun.spec:1.216 SPECS/java-sun.spec:1.217 --- SPECS/java-sun.spec:1.216 Thu Feb 5 12:38:33 2009 +++ SPECS/java-sun.spec Thu Feb 5 14:33:16 2009 @@ -9,8 +9,6 @@ # /usr/lib/jvm/java-sun-1.6.0.10/jre/lib/servicetag/jdk_header.png # - dep loop (can be solved by moving shared libs to java-sun-libs): # java-sun-jre>java-sun-tools -# - package both old and new browser plugin for x86 (x86_64 has only new -# plugin) # %define _enable_debug_packages 0 # @@ -22,7 +20,7 @@ Summary(pl.UTF-8): Sun JDK - środowisko programistyczne Javy dla Linuksa Name: java-sun Version: 1.6.0.12 -Release: 0.1 +Release: 0.2 License: restricted, distributable Group: Development/Languages/Java #Source0: http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-i586.bin @@ -229,7 +227,7 @@ %package -n browser-plugin-%{name} Summary: Java plugin for WWW browsers -Summary(pl.UTF-8): Wtyczki Javy do przeglądarek WWW +Summary(pl.UTF-8): Wtyczka Javy do przeglądarek WWW Group: Development/Languages/Java Requires: %{name}-jre-X11 = %{version}-%{release} Requires: browser-plugins >= 2.0 @@ -238,6 +236,7 @@ Provides: mozilla-firefox-plugin-java-sun Provides: mozilla-plugin-java-sun Obsoletes: blackdown-java-sdk-mozilla-plugin +Obsoletes: browser-plugin-ng-%{name} Obsoletes: java-blackdown-mozilla-plugin Obsoletes: java-sun-moz-plugin Obsoletes: java-sun-mozilla-plugin @@ -257,7 +256,42 @@ Java plugin for WWW browsers. %description -n browser-plugin-%{name} -l pl.UTF-8 -Wtyczki z obsługą Javy dla przeglądarek WWW. +Wtyczka z obsługą Javy dla przeglądarek WWW. + +%package -n browser-plugin-ng-%{name} +Summary: Next-Generation Java plugin for WWW browsers +Summary(pl.UTF-8): Wtyczka Javy Nowej Generacji do przeglądarek WWW +Group: Development/Languages/Java +Requires: %{name}-jre-X11 = %{version}-%{release} +Requires: browser-plugins >= 2.0 +Requires: browser-plugins(%{_target_base_arch}) +Provides: java-sun-mozilla-plugin +Provides: mozilla-firefox-plugin-java-sun +Provides: mozilla-plugin-java-sun +Obsoletes: blackdown-java-sdk-mozilla-plugin +Obsoletes: browser-plugin-%{name} +Obsoletes: java-blackdown-mozilla-plugin +Obsoletes: java-sun-moz-plugin +Obsoletes: java-sun-mozilla-plugin +Obsoletes: jre-mozilla-plugin +Obsoletes: mozilla-firefox-plugin-gcc2-java-sun +Obsoletes: mozilla-firefox-plugin-gcc3-java-sun +Obsoletes: mozilla-firefox-plugin-java-blackdown +Obsoletes: mozilla-firefox-plugin-java-sun +Obsoletes: mozilla-plugin-blackdown-java-sdk +Obsoletes: mozilla-plugin-gcc2-java-sun +Obsoletes: mozilla-plugin-gcc3-java-sun +Obsoletes: mozilla-plugin-gcc32-java-sun +Obsoletes: mozilla-plugin-java-blackdown +Obsoletes: mozilla-plugin-java-sun + +%description -n browser-plugin-ng-%{name} +Next-Generation Java plugin for WWW browsers. Works only with +Firefox/Iceweasel 3.x. + +%description -n browser-plugin-ng-%{name} -l pl.UTF-8 +Wtyczka Nowej Generacji z obsługą Javy dla przeglądarek WWW. Działa +tylko z Firefoxem/Iceweaselem 3.x. %package sources Summary: JDK sources @@ -370,6 +404,7 @@ # Plugin in regular location simply does not work (is seen by browsers): %ifarch %{ix86} ln -sf %{jredir}/plugin/i386/ns7/libjavaplugin_oji.so $RPM_BUILD_ROOT%{_browserpluginsdir} +ln -sf %{jredir}/lib/amd64/libnpjp2.so $RPM_BUILD_ROOT%{_browserpluginsdir} %endif %ifarch %{x8664} ln -sf %{jredir}/lib/amd64/libnpjp2.so $RPM_BUILD_ROOT%{_browserpluginsdir} @@ -474,6 +509,14 @@ %update_browser_plugins fi +%post -n browser-plugin-ng-%{name} +%update_browser_plugins + +%postun -n browser-plugin-ng-%{name} +if [ "$1" = 0 ]; then + %update_browser_plugins +fi + %files %defattr(644,root,root,755) %doc COPYRIGHT LICENSE README.html @@ -830,21 +873,26 @@ %lang(ja) %{_mandir}/ja/man1/rmic.1* %lang(ja) %{_mandir}/ja/man1/rmiregistry.1* +%ifarch %{ix86} %files -n browser-plugin-%{name} %defattr(644,root,root,755) %dir %{jredir}/plugin -%attr(755,root,root) %{jredir}/lib/%{arch}/libjavaplugin*.so -%ifarch %{x8664} -%attr(755,root,root) %{jredir}/lib/%{arch}/libnpjp2.so -%endif -%ifarch %{ix86} %dir %{jredir}/plugin/%{arch} %dir %{jredir}/plugin/%{arch}/ns7 %dir %{jredir}/plugin/%{arch}/ns7-gcc29 +%attr(755,root,root) %{jredir}/lib/%{arch}/libjavaplugin*.so %attr(755,root,root) %{jredir}/plugin/%{arch}/*/libjavaplugin_oji.so +%attr(755,root,root) %{_browserpluginsdir}/libjavaplugin_oji.so +%{jredir}/plugin/desktop %endif + +%files -n browser-plugin-ng-%{name} +%defattr(644,root,root,755) +%dir %{jredir}/plugin +%attr(755,root,root) %{jredir}/lib/%{arch}/libjavaplugin*.so +%attr(755,root,root) %{jredir}/lib/%{arch}/libnpjp2.so +%attr(755,root,root) %{_browserpluginsdir}/libnpjp2.so %{jredir}/plugin/desktop -%attr(755,root,root) %{_browserpluginsdir}/*.so %files sources %defattr(644,root,root,755) @@ -857,6 +905,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.217 2009/02/05 13:33:16 hawk +- package old Java plugin as default one, new plugin as browser-plugin-ng + (it works only with Firefox/Iceweasel 3.x), mutual O: for plugins +- release 0.2, please test i686 with both old and new plugins + Revision 1.216 2009/02/05 11:38:33 hawk - updated to 1.6.0.12 - release 0.1, check new TODO entry ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-sun.spec?r1=1.216&r2=1.217&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
