SPECS (java-sun-1_5): java-sun.spec - update to 1.5.0.12, avoid ex...

[glen]

Author: glen                         Date: Tue Aug 21 06:57:22 2007 GMT
Module: SPECS                         Tag: java-sun-1_5
---- Log message:
- update to 1.5.0.12, avoid executing upstream binaries

---- Files affected:
SPECS:
   java-sun.spec (1.152.2.6 -> 1.152.2.7) 

---- Diffs:

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.152.2.6 SPECS/java-sun.spec:1.152.2.7
--- SPECS/java-sun.spec:1.152.2.6	Wed Apr 11 15:49:07 2007
+++ SPECS/java-sun.spec	Tue Aug 21 08:57:16 2007
@@ -1,9 +1,10 @@
 # $Revision$, $Date$
 # TODO:
-#	- better way to choose preferred jvm (currently the symlinks are hardcoded)
-#	  Maybe a package containing only the symlinks?
+# - better way to choose preferred jvm (currently the symlinks are hardcoded)
+#   Maybe a package containing only the symlinks?
+# - package? /usr/lib/jvm/java-sun-1.5.0.12/jre/lib/deploy/ffjcext.zip
 #
-%define		_ver	1.5.0.11
+%define		_ver	1.5.0.12
 %define		_src_ver	%(echo %{_ver}|tr . _)
 %define		_dir_ver	%(echo %{_ver}|sed 's/\\.\\(..\\)$/_\\1/')
 # class data version seen with file(1) that this jvm is able to load
@@ -13,13 +14,13 @@
 Summary(pl):	Sun JDK - środowisko programistyczne Javy dla Linuksa
 Name:		java-sun
 Version:	%{_ver}
-Release:	0.1
+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:	9dfdad6a166ed403513c0a5509d82e4b
+# Source0-md5:	9b0d717810953e78d5c40969e382e1ae
 Source1:	http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-amd64.bin
-# Source1-md5:	ace2fc1b8c9d381b4e297c66c5a9caa7
+# Source1-md5:	948295f3e252670eb9328cbbc422e3a6
 Source2:	Test.java
 Patch0:		%{name}-ControlPanel-fix.patch
 Patch1:		%{name}-desktop.patch
@@ -257,10 +258,10 @@
 %setup -q -T -c -n jdk%{_dir_ver}
 cd ..
 %ifarch %{ix86}
-sh %{SOURCE0} --accept-license --unpack
+%{__unzip} -q %{SOURCE0} || :
 %endif
 %ifarch %{x8664}
-sh %{SOURCE1} --accept-license --unpack
+%{__unzip} -q %{SOURCE1} || :
 %endif
 cd -
 %ifnarch %{x8664}
@@ -270,6 +271,11 @@
 %patch1 -p1
 %endif
 
+# unpack packed jar files -- in %%prep as it is done "in place"
+for pack in $(find . -name '*.pack'); do
+	bin/unpack200 -r $pack ${pack%.pack}.jar
+done
+
 cp %{SOURCE2} Test.java
 
 %build
@@ -821,6 +827,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.152.2.7  2007/08/21 06:57:16  glen
+- update to 1.5.0.12, avoid executing upstream binaries
+
 Revision 1.152.2.6  2007/04/11 13:49:07  glen
 - update to 1.5.0.11
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-sun.spec?r1=1.152.2.6&r2=1.152.2.7&f=u