SPECS: java-sun.spec - use --accept-license --unpack args (merged ...

[qboosh]

Author: qboosh                       Date: Tue Apr  3 19:42:31 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use --accept-license --unpack args (merged from AC-branch, by glen)

---- Files affected:
SPECS:
   java-sun.spec (1.177 -> 1.178) 

---- Diffs:

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.177 SPECS/java-sun.spec:1.178
--- SPECS/java-sun.spec:1.177	Wed Feb 28 02:09:29 2007
+++ SPECS/java-sun.spec	Tue Apr  3 21:42:25 2007
@@ -254,15 +254,12 @@
 %prep
 %setup -q -T -c -n jdk%{_dir_ver}
 cd ..
-export MORE=10000
 %ifarch %{ix86}
-sh %{SOURCE0} <<EOF
+sh %{SOURCE0} --accept-license --unpack
 %endif
 %ifarch %{x8664}
-sh %{SOURCE1} <<EOF
+sh %{SOURCE1} --accept-license --unpack
 %endif
-yes
-EOF
 cd -
 %ifarch %{ix86}
 # patch only copy of the desktop file, leave original unchanged
@@ -270,11 +267,6 @@
 %patch0 -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
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{jredir},%{javadir},%{jvmjardir},%{_javadir},%{_bindir},%{_includedir}} \
@@ -817,6 +809,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.178  2007/04/03 19:42:25  qboosh
+- use --accept-license --unpack args (merged from AC-branch, by glen)
+
 Revision 1.177  2007/02/28 01:09:29  glen
 - kinit and klist do not exist
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/java-sun.spec?r1=1.177&r2=1.178&f=u