SPECS (AC-branch): eclipse.spec - Release: 2 (version 3.1.2 for Ac...

[jajcus]

Author: jajcus                       Date: Sat May 20 20:33:26 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- Release: 2 (version 3.1.2 for Ac)
- use jpackage-utils
- no hardcoded JAVA_HOME

---- Files affected:
SPECS:
   eclipse.spec (1.54 -> 1.54.4.1) 

---- Diffs:

================================================================
Index: SPECS/eclipse.spec
diff -u SPECS/eclipse.spec:1.54 SPECS/eclipse.spec:1.54.4.1
--- SPECS/eclipse.spec:1.54	Mon Apr  3 17:02:07 2006
+++ SPECS/eclipse.spec	Sat May 20 22:33:21 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/)
@@ -15,7 +16,7 @@
 Name:		eclipse
 Version:	%{_ver_major}
 #Release:	0.%{_mver}_%{_buildid}.1
-Release:	1
+Release:	2
 License:	EPL v1.0
 Group:		Development/Tools
 Source0:	http://download.eclipse.org/eclipse/downloads/drops/R-%{_ver_major}-%{_buildid}/%{name}-sourceBuild-srcIncluded-%{_ver_major}.zip
@@ -24,16 +25,17 @@
 Patch0:		%{name}-core_resources-makefile.patch
 Patch1:		%{name}-jikesbuild.patch
 URL:		http://www.eclipse.org/
-BuildRequires:	jakarta-ant >= 1.6.1
+BuildRequires:	ant >= 1.6.1
 BuildRequires:	jdk >= 1.4
+BuildRequires:	jpackage-utils
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	unzip
 BuildRequires:	zip
-Requires:	jakarta-ant
+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/')
@@ -54,7 +56,8 @@
 %patch1 -p1
 
 %build
-export JAVA_HOME=%{_libdir}/java
+unset JAVA_HOME || :
+export JAVA_HOME="%{java_home}" 
 
 ./build -os linux -ws gtk -arch %{_eclipse_arch} -target compile
 
@@ -76,7 +79,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
 
 tar xfz result/linux-gtk-%{_eclipse_arch}-sdk.tar.gz -C $RPM_BUILD_ROOT%{_libdir}
@@ -223,6 +227,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54.4.1  2006/05/20 20:33:21  jajcus
+- Release: 2 (version 3.1.2 for Ac)
+- use jpackage-utils
+- no hardcoded JAVA_HOME
+
 Revision 1.54  2006/04/03 15:02:07  glen
 - cosmetics
 
================================================================

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