X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=eclipse.spec;h=a6d65f62ff2cf5e2777f4834a61f1631feb6221e;hb=f09fd9a2d13194c9b6fc8731cce2a4600eda4ff5;hp=1acfe5553eeb81bd972ea0297147f94bcd2406ed;hpb=fb7708b1b0cc86d5f90b60081ee53ccc18a44f65;p=packages%2Feclipse.git

diff --git a/eclipse.spec b/eclipse.spec
index 1acfe55..a6d65f6 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,5 +1,3 @@
-%include /usr/lib/rpm/macros.java
-#
 # TODO:
 #			- separate SWT (there are separate tarballs at http://www.eclipse.org/swt/)
 #			  and add proper provides, obsoletes, conflicts etc. where needed.
@@ -8,8 +6,8 @@
 #
 %define		_ver_major	3.2
 %define		_ver_minor	1
-%define		_ver_rc		RC4
-%define		_buildid	200605121600
+%define		_ver_rc		RC5
+%define		_buildid	200605191206
 #
 Summary:	Eclipse - an open extensible IDE
 Summary(pl):	Eclipse - otwarte, rozszerzalne ¶rodowisko programistyczne
@@ -20,7 +18,7 @@ Release:	0.%{_ver_rc}_%{_buildid}.1
 License:	EPL v1.0
 Group:		Development/Tools
 Source0:	http://download.eclipse.org/eclipse/downloads/drops/S-%{_ver_major}%{_ver_rc}-%{_buildid}/%{name}-sourceBuild-srcIncluded-%{_ver_major}%{_ver_rc}.zip
-# Source0-md5:	c0a82a20347c0de3f956fdb6826e1d04
+# Source0-md5:	3ac98928d84d52c04f95e3cb45af66ff
 Source1:	%{name}.desktop
 Patch0:		%{name}-core_resources-makefile.patch
 Patch1:		%{name}-build.patch
@@ -28,8 +26,7 @@ URL:		http://www.eclipse.org/
 BuildRequires:	ant >= 1.6.1
 BuildRequires:	jdk >= 1.4
 BuildRequires:	pkgconfig
-BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.213
+BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	unzip
 BuildRequires:	zip
 Requires:	ant
@@ -56,7 +53,7 @@ wszystkiego i niczego w szczeg
 %patch1 -p0
 
 %build
-unset JAVA_HOME || :
+unset CLASSPATH || :
 export JAVA_HOME=%{java_home}
 
 ./build -os linux -ws gtk -arch %{_eclipse_arch} -target compile -java5home %{_libdir}/java