SPECS (AC-branch): java-sun.spec - use --accept-license --unpack args
glen
glen at pld-linux.org
Mon Apr 2 18:05:06 CEST 2007
Author: glen Date: Mon Apr 2 16:05:06 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- use --accept-license --unpack args
---- Files affected:
SPECS:
java-sun.spec (1.172.2.1 -> 1.172.2.2)
---- Diffs:
================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.172.2.1 SPECS/java-sun.spec:1.172.2.2
--- SPECS/java-sun.spec:1.172.2.1 Wed Feb 28 02:11:07 2007
+++ SPECS/java-sun.spec Mon Apr 2 18:04:55 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.172.2.2 2007/04/02 16:04:55 glen
+- use --accept-license --unpack args
+
Revision 1.172.2.1 2007/02/28 01:11:07 glen
- RPATH fix merge from HEAD; rel 6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/java-sun.spec?r1=1.172.2.1&r2=1.172.2.2&f=u
More information about the pld-cvs-commit
mailing list