Author: glen Date: Fri Feb 26 11:21:57 2010 GMT Module: packages Tag: HEAD ---- Log message: - grab java class version by printing out java.class.version system property with precompiled class. hopefully this will not hung our builders rel 4
---- Files affected: packages/java-sun: java-sun.spec (1.237 -> 1.238) ---- Diffs: ================================================================ Index: packages/java-sun/java-sun.spec diff -u packages/java-sun/java-sun.spec:1.237 packages/java-sun/java-sun.spec:1.238 --- packages/java-sun/java-sun.spec:1.237 Fri Feb 26 09:52:57 2010 +++ packages/java-sun/java-sun.spec Fri Feb 26 12:21:51 2010 @@ -25,7 +25,7 @@ Summary(pl.UTF-8): Sun JDK - środowisko programistyczne Javy dla Linuksa Name: java-sun Version: 1.6.0.18 -Release: 3 +Release: 4 License: restricted, distributable Group: Development/Languages/Java Source0: http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-i586.bin @@ -33,13 +33,9 @@ Source1: http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-amd64.bin # Source1-md5: 870ab3588f4d50405a2747fe968d0481 Source2: Test.java +Source3: Test.class Patch0: %{name}-desktop.patch URL: https://jdk-distros.dev.java.net/developer.html -%if %{pld_release} == "ac" -BuildRequires: file -%else -BuildRequires: file >= 4.26-4 -%endif BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpm-build >= 4.3-0.20040107.21 BuildRequires: rpmbuild(macros) >= 1.453 @@ -347,6 +343,7 @@ done cp %{SOURCE2} Test.java +cp %{SOURCE3} Test.class %build %if %{with tests} @@ -357,11 +354,9 @@ echo >&2 "WARNING: /proc not mounted -- compile test may fail" fi -# $ORIGIN does not work on PLD builders. workaround. -export LD_LIBRARY_PATH=$(pwd)/jre/lib/%{arch}/jli -./bin/javac Test.java +# $ORIGIN does not work on PLD builders. workaround with LD_LIBARY_PATH +classver=$(LD_LIBRARY_PATH=$(pwd)/jre/lib/%{arch}/jli ./bin/java Test) -classver=$(file Test.class | grep -o 'compiled Java class data, version [0-9.]*' | awk '{print $NF}') if [ "$classver" != %{_classdataversion} ]; then echo "Set %%define _classdataversion to $classver and rerun." exit 1 @@ -940,6 +935,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.238 2010/02/26 11:21:51 glen +- grab java class version by printing out java.class.version system property + with precompiled class. hopefully this will not hung our builders + rel 4 + Revision 1.237 2010/02/26 08:52:57 glen - release 3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-sun/java-sun.spec?r1=1.237&r2=1.238&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
