Author: arekm Date: Mon Jul 14 20:14:58 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - up to 6u7 (1.6.0.07)
---- Files affected: SPECS: java-sun.spec (1.205 -> 1.206) ---- Diffs: ================================================================ Index: SPECS/java-sun.spec diff -u SPECS/java-sun.spec:1.205 SPECS/java-sun.spec:1.206 --- SPECS/java-sun.spec:1.205 Tue May 13 18:29:19 2008 +++ SPECS/java-sun.spec Mon Jul 14 22:14:53 2008 @@ -8,21 +8,21 @@ # runtime or 2) prevent java from finding Xinerama extension. For now we do ugly 2). # See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6532373 for details. # -%define _src_ver 6u6 +%define _src_ver 6u7 %define _dir_ver %(echo %{version} | sed 's/\\.\\(..\\)$/_\\1/') # class data version seen with file(1) that this jvm is able to load %define _classdataversion 50.0 Summary: Sun JDK (Java Development Kit) for Linux Summary(pl.UTF-8): Sun JDK - środowisko programistyczne Javy dla Linuksa Name: java-sun -Version: 1.6.0.06 +Version: 1.6.0.07 Release: 1 License: restricted, distributable Group: Development/Languages/Java Source0: http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-i586.bin -# Source0-md5: 0efe7120ffb9a3379bc66d993056d80d +# Source0-md5: 169c7fdf20eb37359b0f6235bd3c0ec0 Source1: http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-amd64.bin -# Source1-md5: 6f3036a444ff0015d1f2db4fd0db1951 +# Source1-md5: b94bbdefeb6c97f1799583dec49e090f Source2: Test.java Patch0: %{name}-desktop.patch URL: https://jdk-distros.dev.java.net/developer.html @@ -290,8 +290,10 @@ # $ORIGIN does not work on PLD builders. workaround. export LD_LIBRARY_PATH=$(pwd)/jre/lib/%{arch}/jli ./bin/javac Test.java + classver=$(file Test.class | grep -o 'compiled Java class data, version [0-9.]*' | awk '{print $NF}') -if [ "$classver" != %{_classdataversion} ]; then +# DROPME: file 4.24 is broken so temporaily test for -n .... Drop after file is fixed. +if [ -n "$classver" -a "$classver" != %{_classdataversion} ]; then echo "Set %%define _classdataversion to $classver and rerun." exit 1 fi @@ -330,7 +332,7 @@ 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 apt; do + jvisualvm schemagen wsgen wsimport xjc apt; do [ -f $RPM_BUILD_ROOT%{javadir}/bin/$i ] || exit 1 ln -sf %{javadir}/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i done @@ -743,11 +745,15 @@ %{_desktopdir}/sun_java.desktop %{_pixmapsdir}/sun_java.png %endif +%attr(755,root,root) %{_bindir}/jvisualvm %attr(755,root,root) %{_bindir}/policytool %attr(755,root,root) %{jredir}/bin/policytool %attr(755,root,root) %{javadir}/bin/policytool %{_mandir}/man1/policytool.1* %lang(ja) %{_mandir}/ja/man1/policytool.1* +%attr(755,root,root) %{javadir}/bin/jvisualvm +%{_mandir}/man1/jvisualvm.1* +%{javadir}/lib/visualvm %{jredir}/lib/fonts %{jredir}/lib/oblique-fonts %dir %{jredir}/lib/%{arch}/xawt @@ -854,7 +860,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.205 2008/05/13 16:29:19 arvenil +Revision 1.206 2008/07/14 20:14:53 arekm +- up to 6u7 (1.6.0.07) + +Revision 1.205 2008-05-13 16:29:19 arvenil - up to 1.6.0.06 Revision 1.204 2008-04-19 14:32:30 glen ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-sun.spec?r1=1.205&r2=1.206&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
