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

diff --git a/eclipse.spec b/eclipse.spec
index 1acfe55..3e00a71 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,19 +6,17 @@
 #
 %define		_ver_major	3.2
 %define		_ver_minor	1
-%define		_ver_rc		RC4
-%define		_buildid	200605121600
+%define		_buildid	200606291905
 #
 Summary:	Eclipse - an open extensible IDE
 Summary(pl):	Eclipse - otwarte, rozszerzalne ¶rodowisko programistyczne
 Name:		eclipse
 Version:	%{_ver_major}
-Release:	0.%{_ver_rc}_%{_buildid}.1
-#Release:	1
+Release:	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:	http://download.eclipse.org/eclipse/downloads/drops/R-%{_ver_major}-%{_buildid}/%{name}-sourceBuild-srcIncluded-%{_ver_major}.zip
+# Source0-md5:	67b41802092d4b2f779fb756dcaec85c
 Source1:	%{name}.desktop
 Patch0:		%{name}-core_resources-makefile.patch
 Patch1:		%{name}-build.patch
@@ -28,14 +24,14 @@ 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:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	unzip
 BuildRequires:	zip
 Requires:	ant
 Requires:	jdk >= 1.4
 Obsoletes:	eclipse-SDK
-ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
+ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664}
 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/')
@@ -56,7 +52,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
@@ -101,6 +97,7 @@ EOF
 if [ ! -f "$RPM_BUILD_ROOT%{_libdir}/%{name}/icon.xpm" ]; then
 	install features/org.eclipse.platform.launchers/bin/gtk/linux/x86/icon.xpm $RPM_BUILD_ROOT%{_libdir}/%{name}/icon.xpm
 fi
+install -D features/org.eclipse.platform.launchers/bin/gtk/linux/x86/icon.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/eclipse-icon.xpm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -111,6 +108,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/eclipse
 %attr(755,root,root) %{_libdir}/%{name}/lib*.so
 %{_desktopdir}/eclipse.desktop
+%{_pixmapsdir}/eclipse-icon.xpm
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/.eclipseproduct
 %{_libdir}/%{name}/configuration