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

diff --git a/eclipse.spec b/eclipse.spec
index 9409035..a6d65f6 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,40 +1,38 @@
-#
 # TODO:
 #			- separate SWT (there are separate tarballs at http://www.eclipse.org/swt/)
 #			  and add proper provides, obsoletes, conflicts etc. where needed.
 #			  This will make building such things like Azureus possible without having
 #			  whole Eclipse suite installed.
 #
-%define		_buildid	200506271435
-#define		_mver		M6
-%define		_ver_major	3.1
-%define		_ver_minor	0
+%define		_ver_major	3.2
+%define		_ver_minor	1
+%define		_ver_rc		RC5
+%define		_buildid	200605191206
 #
 Summary:	Eclipse - an open extensible IDE
 Summary(pl):	Eclipse - otwarte, rozszerzalne ¶rodowisko programistyczne
 Name:		eclipse
 Version:	%{_ver_major}
-#Release:	0.%{_mver}_%{_buildid}.1
-Release:	2	
+Release:	0.%{_ver_rc}_%{_buildid}.1
+#Release:	1
 License:	EPL v1.0
 Group:		Development/Tools
-#Source0:	http://download.eclipse.org/downloads/drops/S-%{_ver_major}%{_mver}-%{_buildid}/eclipse-sourceBuild-srcIncluded-%{_ver_major}%{_mver}.zip
-Source0:	http://download.eclipse.org/eclipse/downloads/drops/R-%{_ver_major}-%{_buildid}/eclipse-sourceBuild-srcIncluded-%{_ver_major}.zip
-# Source0-md5:	19ad65d52005da5eaa1d3687b3a50de2
+Source0:	http://download.eclipse.org/eclipse/downloads/drops/S-%{_ver_major}%{_ver_rc}-%{_buildid}/%{name}-sourceBuild-srcIncluded-%{_ver_major}%{_ver_rc}.zip
+# Source0-md5:	3ac98928d84d52c04f95e3cb45af66ff
 Source1:	%{name}.desktop
 Patch0:		%{name}-core_resources-makefile.patch
-Patch1:		%{name}-jikesbuild.patch
+Patch1:		%{name}-build.patch
 URL:		http://www.eclipse.org/
-BuildRequires:	jakarta-ant >= 1.6.1
+BuildRequires:	ant >= 1.6.1
 BuildRequires:	jdk >= 1.4
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.213
+BuildRequires:	rpmbuild(macros) >= 1.300
 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/')
@@ -52,23 +50,22 @@ wszystkiego i niczego w szczeg
 %prep
 %setup -q -c
 %patch0 -p0
-%patch1 -p1
+%patch1 -p0
 
 %build
-export JAVA_HOME=%{_libdir}/java
+unset CLASSPATH || :
+export JAVA_HOME=%{java_home}
 
-./build -os linux -ws gtk -arch %{_eclipse_arch} -target compile
+./build -os linux -ws gtk -arch %{_eclipse_arch} -target compile -java5home %{_libdir}/java
 
 export JAVA_INC="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
 
-%{__make} -C plugins/org.eclipse.core.resources.linux/src \
+%{__make} -C plugins/org.eclipse.core.filesystem/natives/unix/linux/ \
     CFLAGS="%{rpmcflags} $JAVA_INC" \
     LDFLAGS="%{rpmldflags}"
-mv plugins/org.eclipse.core.resources.linux/{src/libcore*.so,os/linux/%{_eclipse_arch}}
 
 cd plugins/org.eclipse.update.core.linux/src
 %{__cc} %{rpmcflags} -fPIC %{rpmldflags} -I. $JAVA_INC update.c -o libupdate.so -shared
-mv libupdate.so ../os/linux/%{_eclipse_arch}
 cd -
 
 %install
@@ -77,20 +74,31 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_bindir},%{_libdir}/%{name}}
 # place for arch independent plugins
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{features,plugins}
 
-./build -os linux -ws gtk -arch %{_eclipse_arch} -target install
+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}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
+install plugins/org.eclipse.core.filesystem/natives/unix/linux/lib*.so $RPM_BUILD_ROOT%{_libdir}/%{name}
+install plugins/org.eclipse.update.core.linux/src/lib*.so $RPM_BUILD_ROOT%{_libdir}/%{name}
+
+cp -a baseLocation/plugins/* $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+
 #wrapper
 install -d $RPM_BUILD_ROOT%{_bindir}
-cat > $RPM_BUILD_ROOT%{_bindir}/eclipse << EOF
+cat > $RPM_BUILD_ROOT%{_bindir}/eclipse << 'EOF'
 #!/bin/sh
-exec %{_libdir}/%{name}/eclipse \$*
+exec %{_libdir}/%{name}/eclipse $*
 EOF
 
 :> $RPM_BUILD_ROOT%{_datadir}/%{name}/.eclipseextension
 
+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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -98,6 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/eclipse
 %attr(755,root,root) %{_libdir}/%{name}/eclipse
+%attr(755,root,root) %{_libdir}/%{name}/lib*.so
 %{_desktopdir}/eclipse.desktop
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/.eclipseproduct
@@ -108,6 +117,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/notice.html
 %{_libdir}/%{name}/readme
 %{_libdir}/%{name}/startup.jar
+%{_libdir}/%{name}/about.html
+#%{_libdir}/%{name}/about_files
 %dir %{_libdir}/%{name}/features
 %{_libdir}/%{name}/features/org.eclipse.jdt_*.*.*
 %{_libdir}/%{name}/features/org.eclipse.jdt.source_*.*.*
@@ -119,6 +130,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/features/org.eclipse.rcp.source_*.*.*
 %{_libdir}/%{name}/features/org.eclipse.sdk_*.*.*
 %dir %{_libdir}/%{name}/plugins
+%{_libdir}/%{name}/plugins/com.ibm.icu_*.*.*
+%{_libdir}/%{name}/plugins/com.ibm.icu.source_*.*.*
+%{_libdir}/%{name}/plugins/com.ibm.icu.base_*.*.*
+%{_libdir}/%{name}/plugins/com.ibm.icu.base.source_*.*.*
+%{_libdir}/%{name}/plugins/com.jcraft.jsch_*.*.*
 %{_libdir}/%{name}/plugins/org.apache.ant_*.*.*
 %{_libdir}/%{name}/plugins/org.apache.lucene_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ant.core_*.*.*
@@ -126,33 +142,46 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/plugins/org.eclipse.compare_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.boot_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.commands_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.expressions_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem.linux.*_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.jobs_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.resources_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*.*.*
-%{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*.jar
 %{_libdir}/%{name}/plugins/org.eclipse.core.runtime_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.auth_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.registry_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.variables_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.debug.core_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.debug.ui_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.common_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.registry_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help.appserver_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help.base_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help.ui_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help.webapp_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.core_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.apt.ui_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.core.manipulation*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.debug.ui_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.doc.user_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.junit_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.junit4.runtime_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.launching_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.source_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.ui_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jface_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jface.databinding_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jface.text_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_*.*.*
@@ -180,6 +209,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/plugins/org.eclipse.search_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.swt_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.browser_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.navigator_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.navigator.resources_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.team.core_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_*.*.*
@@ -196,8 +227,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/plugins/org.eclipse.ui.forms_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.ide_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.intro_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.intro.universal_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.presentations.r21_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.views_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.views.properties.tabbed_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*.*.*
@@ -207,6 +240,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.update.ui_*.*.*
 %{_libdir}/%{name}/plugins/org.junit_*.*.*
+%{_libdir}/%{name}/plugins/org.junit4_*.*.*
 
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/features