Author: glen Date: Mon Jan 29 22:08:40 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - libsplashscreen.so available on amd64 too - don't create dead symlinks
---- Files affected: SPECS: java-sun.spec (1.168 -> 1.169) ---- Diffs: ================================================================ Index: SPECS/java-sun.spec diff -u SPECS/java-sun.spec:1.168 SPECS/java-sun.spec:1.169 --- SPECS/java-sun.spec:1.168 Mon Jan 29 22:51:37 2007 +++ SPECS/java-sun.spec Mon Jan 29 23:08:35 2007 @@ -10,7 +10,7 @@ Summary(pl): Sun JDK - środowisko programistyczne Javy dla Linuksa Name: java-sun Version: 1.6.0 -Release: 3.2 +Release: 3.3 License: restricted, distributable Group: Development/Languages/Java Source0: http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-i586.bin @@ -303,12 +303,17 @@ ln -sf %{jredir}/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i done -for i in HtmlConverter appletviewer extcheck idlj jar jarsigner java-rmi.cgi \ - javac javadoc javah javap jcontrol jconsole jdb jhat jinfo jmap jps \ +for i in appletviewer extcheck idlj jar jarsigner \ + javac javadoc javah javap jconsole jdb jhat jinfo jmap jps \ jrunscript jsadebugd jstack jstat jstatd native2ascii rmic serialver \ schemagen wsgen wsimport xjc ; do ln -sf %{javadir}/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i done +%ifarch %{ix86} +for i in HtmlConverter jcontrol java-rmi.cgi; do + ln -sf %{javadir}/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i +done +%endif # make sure all tools are available under $(JDK_HOME)/bin for i in ControlPanel keytool kinit klist orbd policytool rmid \ @@ -338,7 +343,7 @@ ln -sf %{jredir}/lib/jsse.jar $RPM_BUILD_ROOT%{jvmjardir}/jnet.jar ln -sf %{jredir}/lib/jce.jar $RPM_BUILD_ROOT%{jvmjardir}/jce.jar for f in jndi jndi-ldap jndi-cos jndi-rmi jaas jdbc-stdext jdbc-stdext-3.0 \ - sasl jaxp_parser_impl jaxp_transform_impl jaxp jmx xml-commons-apis; do + sasl jaxp_parser_impl jaxp_transform_impl jaxp jmx xml-commons-apis; do ln -sf %{jredir}/lib/rt.jar $RPM_BUILD_ROOT%{jvmjardir}/$f.jar done @@ -396,6 +401,7 @@ %ifarch %{ix86} %attr(755,root,root) %{_bindir}/HtmlConverter %attr(755,root,root) %{_bindir}/java-rmi.cgi +%attr(755,root,root) %{_bindir}/jcontrol %endif %attr(755,root,root) %{_bindir}/extcheck %attr(755,root,root) %{_bindir}/idlj @@ -663,12 +669,10 @@ %{jredir}/lib/oblique-fonts %dir %{jredir}/lib/%{arch}/xawt %dir %{jredir}/lib/%{arch}/motif21 +%attr(755,root,root) %{jredir}/lib/%{arch}/libsplashscreen.so %ifarch %{ix86} %attr(755,root,root) %{jredir}/lib/%{arch}/libjavaplugin*.so %endif -%ifarch %{x8664} -%attr(755,root,root) %{jredir}/lib/%{arch}/libsplashscreen.so -%endif %ifarch %{ix86} %{jvmjardir}/javaws.jar %endif @@ -767,6 +771,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.169 2007/01/29 22:08:35 glen +- libsplashscreen.so available on amd64 too +- don't create dead symlinks + Revision 1.168 2007/01/29 21:51:37 glen - fix duplicate jexec packaging ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/java-sun.spec?r1=1.168&r2=1.169&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
