SPECS: eclipse.spec - use jpackage-utils for build. No hardcoded J...

[jajcus]

Author: jajcus                       Date: Sat May 20 18:58:37 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use jpackage-utils for build. No hardcoded JAVA_HOME.

---- Files affected:
SPECS:
   eclipse.spec (1.63 -> 1.64) 

---- Diffs:

================================================================
Index: SPECS/eclipse.spec
diff -u SPECS/eclipse.spec:1.63 SPECS/eclipse.spec:1.64
--- SPECS/eclipse.spec:1.63	Sat May 20 16:26:15 2006
+++ SPECS/eclipse.spec	Sat May 20 20:58:32 2006
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%include /usr/lib/rpm/macros.java
 #
 # TODO:
 #			- separate SWT (there are separate tarballs at http://www.eclipse.org/swt/)
@@ -31,10 +32,11 @@
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	unzip
 BuildRequires:	zip
+BuildRequires:	jpackage-utils
 Requires:	ant
 Requires:	jdk >= 1.4
 Obsoletes:	eclipse-SDK
-ExclusiveArch:	%{ix86} %{x8664} ppc
+ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_eclipse_arch	%(echo %{_target_cpu} | sed 's/i.86\\|athlon\\|pentium/x86/;s/amd64/x86_64/')
@@ -55,7 +57,8 @@
 %patch1 -p0
 
 %build
-export JAVA_HOME=%{_libdir}/java
+unset JAVA_HOME || :
+export JAVA_HOME=%{java_home}
 
 ./build -os linux -ws gtk -arch %{_eclipse_arch} -target compile -java5home %{_libdir}/java
 
@@ -75,7 +78,8 @@
 # place for arch independent plugins
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{features,plugins}
 
-export JAVA_HOME=%{_libdir}/java
+unset JAVA_HOME || :
+export JAVA_HOME=%{java_home}
 ./build -os linux -ws gtk -arch %{_eclipse_arch} -target install -java5home %{_libdir}/java
 
 tar xfz result/linux-gtk-%{_eclipse_arch}-sdk.tar.gz -C $RPM_BUILD_ROOT%{_libdir}
@@ -253,6 +257,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2006/05/20 18:58:32  jajcus
+- use jpackage-utils for build. No hardcoded JAVA_HOME.
+
 Revision 1.63  2006/05/20 14:26:15  arekm
 R: ant in R, too
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/eclipse.spec?r1=1.63&r2=1.64&f=u