X-Git-Url: http://git.pld-linux.org/?p=packages%2Feclipse.git;a=blobdiff_plain;f=eclipse.spec;h=c6571c0ae57cd51c9911be85433e564ac74a58ff;hp=1833c64c81b216cb793c54e16ab0cc97b8e5917d;hb=2588d120cc6fd8a8cf2d8e9f3829f6d856369b91;hpb=d6fcec86e0d40fcf4c531ecf1ac60779ab15d019

diff --git a/eclipse.spec b/eclipse.spec
index 1833c64..c6571c0 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,111 +1,155 @@
-#
-%define		_buildid	200409240800
-%define		_ver_major	3.1
-%define		_ver_minor	0
-%define		_ver		%{_ver_major}.%{_ver_minor}
-#
+# TODO:
+# - make use of eclipse-swt package
+
+%include	/usr/lib/rpm/macros.java
 Summary:	Eclipse - an open extensible IDE
-Summary(pl):	Eclipse - otwarte, rozszerzalne ¶rodowisko programistyczne
+Summary(pl.UTF-8):	Eclipse - otwarte, rozszerzalne środowisko programistyczne
 Name:		eclipse
-Version:	%{_ver_major}
-Release:	0.M2_%{_buildid}.2
-License:	CPL v1.0
+Version:	3.3.2
+Release:	2
+License:	EPL v1.0
 Group:		Development/Tools
-Source0:	http://download.eclipse.org/downloads/drops/S-%{_ver_major}M2-%{_buildid}/eclipse-sourceBuild-srcIncluded-%{_ver_major}M2.zip
-# Source0-md5:	a10fc8b23fd7c6783d55d795168879f0
-# Source0-size:	56139196
+Source0:	http://archive.eclipse.org/eclipse/downloads/drops/R-%{version}-200802211800/%{name}-sourceBuild-srcIncluded-%{version}.zip
+# Source0-md5:	4b7016cf9aedf07b8f34b39470947799
 Source1:	%{name}.desktop
-Patch0:		%{name}-swt-makefile.patch
-Patch1:		%{name}-core_resources-makefile.patch
+Patch0:		%{name}-launcher-set-install-dir-and-shared-config.patch
 URL:		http://www.eclipse.org/
-BuildRequires:	jakarta-ant >= 1.6.1
-BuildRequires:	jdk >= 1.4
-BuildRequires:	kdelibs-devel
-BuildRequires:	libgnomeui-devel
-#BuildRequires:	mozilla-devel
+BuildRequires:	ant >= 1.6.1
+BuildRequires:	ant-apache-regexp
+BuildRequires:	jdk >= 1.6
+BuildRequires:	jpackage-utils
+BuildRequires:	pkgconfig
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
 BuildRequires:	zip
-Requires:	jakarta-ant
-Requires:	jdk >= 1.4
+Requires:	ant
+Provides:	eclipse-jdt = %{version}-%{release}
 Obsoletes:	eclipse-SDK
-ExclusiveArch:	%{ix86} ppc amd64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_eclipse_arch	%(echo %{_target_cpu} | sed 's/i.86/x86/;s/athlon/x86/;s/pentium./x86/')
+%define		eclipse_arch	%(echo %{_target_cpu} | sed 's/i.86\\|athlon\\|pentium/x86/;s/amd64/x86_64/')
+%define		no_install_post_chrpath		1
+
+# list of script capabilities (regexps) not to be used in Provides
+%define		_noautoprov			libcairo.so.2
 
 %description
 Eclipse is a kind of universal tool platform - an open extensible IDE
 for anything and nothing in particular.
 
-%description -l pl
-Eclipse to rodzaj uniwersalnej platformy narzêdziowej - otwarte,
-rozszerzalne IDE (zintegrowane ¶rodowisko programistyczne) do
-wszystkiego i niczego w szczególno¶ci.
+%description -l pl.UTF-8
+Eclipse to rodzaj uniwersalnej platformy narzędziowej - otwarte,
+rozszerzalne IDE (zintegrowane środowisko programistyczne) do
+wszystkiego i niczego w szczególności.
 
 %prep
 %setup -q -c
-%patch1 -p1
+
+# Build Id - it's visible in couple places in GUI
+%{__sed} -i -e 's,buildId=.*,& (PLD Linux %{name}-%{version}-%{release}),' label.properties
+
+# launcher patches
+rm plugins/org.eclipse.platform/launchersrc.zip
+cd features/org.eclipse.equinox.executable
+%patch0 -p0
+# put the configuration directory in an arch-specific location
+sed -i -e 's:/usr/lib/eclipse/configuration:%{_libdir}/%{name}/configuration:' library/eclipse.c
+# make the eclipse binary relocatable
+sed -i -e 's:/usr/share/eclipse:%{_datadir}/%{name}:' library/eclipse.c
+zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library
+cd -
 
 %build
-JAVA_HOME=%{_prefix}/lib/java
-export JAVA_HOME
-./build -os linux -ws gtk -arch %{_eclipse_arch} -target compile
-
-%ifarch amd64
-%define	_swtsrcdir	plugins/org.eclipse.swt.gtk64/ws/gtk
-%else
-%define	_swtsrcdir	plugins/org.eclipse.swt.gtk/ws/gtk
-%endif
+unset CLASSPATH || :
+export JAVA_HOME=%{java_home}
 
-rm -rf swt
-mkdir swt && cd swt
+./build -os linux -ws gtk -arch %{eclipse_arch} -target compile
 
-unzip -x %{_builddir}/%{name}-%{version}/%{_swtsrcdir}/swtsrc.zip
-unzip -x %{_builddir}/%{name}-%{version}/%{_swtsrcdir}/swt-pisrc.zip
-#unzip -x %{_builddir}/%{name}-%{version}/%{_swtsrcdir}/swt-mozillasrc.zip
+%ant insertBuildId
 
 export JAVA_INC="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
 
-patch -p0 < %{PATCH0}
-%{__make} -f make_linux.mak all \
-    XTEST_LIB_PATH=%{_prefix}/X11R6/%{_lib} \
-    OPT="%{rpmcflags}"
-#cp library/* .
-#{__make} -f make_linux.mak make_mozilla \
-#    OPT="%{rpmcflags}"
-cd -
-
-%{__make} -C plugins/org.eclipse.core.resources.linux/src \
+%{__make} -C plugins/org.eclipse.core.filesystem/natives/unix/linux/ \
+    OPT_FLAGS="%{rpmcflags} $JAVA_INC" \
     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} %{rpmldflags} -I. $JAVA_INC update.c -o libupdate.so -shared
-mv libupdate.so ../os/linux/%{_eclipse_arch}
+%{__cc} %{rpmcflags} -fPIC %{rpmldflags} -I. $JAVA_INC update.c -o libupdate.so -shared
 cd -
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_bindir},%{_libdir}/%{name}}
+if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
+	rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
+
+	install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_bindir},%{_libdir}/%{name}}
+	# place for arch independent plugins
+	install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{features,plugins}
+
+	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}
+	touch makeinstall.stamp
+fi
+
+if [ ! -f installed.stamp ]; then
+	install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+
+	install -p plugins/org.eclipse.core.filesystem/natives/unix/linux/lib*.so $RPM_BUILD_ROOT%{_libdir}/%{name}
+	install -p plugins/org.eclipse.update.core.linux/src/lib*.so $RPM_BUILD_ROOT%{_libdir}/%{name}
 
-./build -os linux -ws gtk -arch %{_eclipse_arch} -target install
+	# wrapper
+	install -d $RPM_BUILD_ROOT%{_bindir}
+	cat > $RPM_BUILD_ROOT%{_bindir}/eclipse <<-'EOF'
+	#!/bin/sh
+	exec %{_libdir}/%{name}/eclipse ${1:+"$@"}
+	EOF
 
-unzip result/linux-gtk-%{_eclipse_arch}-sdk.zip -d $RPM_BUILD_ROOT%{_libdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+	cat <<-'EOF'> $RPM_BUILD_ROOT%{_datadir}/%{name}/.eclipseextension
+	id=org.eclipse.platform name=Eclipse Platform
+	version=%{version}
+	EOF
 
-#wrapper
-install -d $RPM_BUILD_ROOT%{_bindir}
-cat > $RPM_BUILD_ROOT%{_bindir}/eclipse << EOF
-#!/bin/sh
-exec %{_libdir}/%{name}/eclipse \$*
-EOF
+	if [ ! -f $RPM_BUILD_ROOT%{_libdir}/%{name}/icon.xpm ]; then
+		install -p features/org.eclipse.equinox.executable/bin/gtk/linux/x86/icon.xpm $RPM_BUILD_ROOT%{_libdir}/%{name}/icon.xpm
+	fi
+	install -Dp features/org.eclipse.equinox.executable/bin/gtk/linux/x86/icon.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/eclipse-icon.xpm
 
-cd swt
-install libswt-{atk-gtk,awt-gtk,gnome-gtk,gtk,kde,pi-gtk}-*.so \
-    $RPM_BUILD_ROOT%{_libdir}/eclipse/plugins/org.eclipse.swt.gtk_%{_ver_major}.%{_ver_minor}/os/linux/%{_eclipse_arch}
-#install libswt-mozilla-gtk-*.so \
-#    $RPM_BUILD_ROOT%{_datadir}/eclipse/plugins/org.eclipse.swt.gtk_%{_ver_major}.%{_ver_minor}/os/linux/%{_eclipse_arch}
+	# not packaged -- remove
+	%if 0
+	# if we're removing source bundles, we should adjust manifests as well, but
+	# were not doing that, so don't break packaging
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.cvs.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.jdt.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.pde.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.platform.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.rcp.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/javax.servlet.jsp.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/javax.servlet.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.apache.ant.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.apache.commons.el.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.apache.commons.logging.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.apache.jasper.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.apache.lucene.analysis.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.apache.lucene.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.cvs.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.jdt.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.pde.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.platform.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.rcp.source.linux.gtk.*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.rcp.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.junit.source_*
+	rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.mortbay.jetty.source_*
+	%endif
+
+	touch installed.stamp
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,68 +158,99 @@ 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
+%{_pixmapsdir}/eclipse-icon.xpm
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/.eclipseproduct
 %{_libdir}/%{name}/configuration
+%{_libdir}/%{name}/eclipse.ini
+%{_libdir}/%{name}/epl-v10.html
 %{_libdir}/%{name}/icon.xpm
 %{_libdir}/%{name}/notice.html
 %{_libdir}/%{name}/readme
-%{_libdir}/%{name}/startup.jar
-
-# features
+%{_libdir}/%{name}/about.html
+#%dir %{_libdir}/%{name}/about_files
+#%{_libdir}/%{name}/about_files/mpl-v11.txt
 %dir %{_libdir}/%{name}/features
+%{_libdir}/%{name}/features/org.eclipse.cvs_*.*.*
 %{_libdir}/%{name}/features/org.eclipse.jdt_*.*.*
-%{_libdir}/%{name}/features/org.eclipse.jdt.source_*.*.*
 %{_libdir}/%{name}/features/org.eclipse.pde_*.*.*
-%{_libdir}/%{name}/features/org.eclipse.pde.source_*.*.*
 %{_libdir}/%{name}/features/org.eclipse.platform_*.*.*
-%{_libdir}/%{name}/features/org.eclipse.platform.source_*.*.*
+%{_libdir}/%{name}/features/org.eclipse.rcp_*.*.*
 %{_libdir}/%{name}/features/org.eclipse.sdk_*.*.*
-
-# plugins
 %dir %{_libdir}/%{name}/plugins
+%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.%{eclipse_arch}_*.*.*
+%{_libdir}/%{name}/plugins/javax.servlet.jsp_*.*.*
+%{_libdir}/%{name}/plugins/javax.servlet_*.*.*
+%{_libdir}/%{name}/plugins/com.ibm.icu_*.*.*
+%{_libdir}/%{name}/plugins/com.jcraft.jsch_*.*.*
 %{_libdir}/%{name}/plugins/org.apache.ant_*.*.*
+%{_libdir}/%{name}/plugins/org.apache.commons.el_*.*.*
+%{_libdir}/%{name}/plugins/org.apache.commons.logging_*.*.*
+%{_libdir}/%{name}/plugins/org.apache.jasper_*.*.*
 %{_libdir}/%{name}/plugins/org.apache.lucene_*.*.*
+%{_libdir}/%{name}/plugins/org.apache.lucene.analysis_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ant.core_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ant.ui_*.*.*
 %{_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.databinding_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.beans_*.*.*
 %{_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.net_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.resources_*.*.*
-
-%dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*
-%dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os
-%dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os/linux
-%dir %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os/linux/%{_eclipse_arch}
-%attr(755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/os/linux/%{_eclipse_arch}/libcore_2_1_0b.so
-%{_libdir}/%{name}/plugins/org.eclipse.core.resources.linux_*.*.*/fragment.xml
-
+%{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*.*.*
 %{_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.cvs_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.debug.core_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.debug.ui_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.app_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.common_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.jetty_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.registry_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.servlet_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.jsp.jasper.registry_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.jsp.jasper_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher_*.*.*
+%{_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.ide_*.*.*
 %{_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.*.*.*
 %{_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.jdt.compiler.apt_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.compiler.tool_*.*.*
 %{_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.jsch.core_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.jsch.ui_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.osgi_*.*.*
@@ -187,37 +262,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/plugins/org.eclipse.pde.doc.user_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.pde.junit.runtime_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.pde.runtime_*.*.*
-%{_libdir}/%{name}/plugins/org.eclipse.pde.source_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.pde.ui_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.pde.ui.templates_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.platform_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.platform.doc.isv_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.platform.doc.user_*.*.*
-%{_libdir}/%{name}/plugins/org.eclipse.platform.source_*.*.*
-%{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.%{_eclipse_arch}_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.rcp_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*.*.*
-%{_libdir}/%{name}/plugins/org.eclipse.search_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.swt_*.*.*
-
-%dir %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*
-%dir %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os
-%dir %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux
-%dir %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux/%{_eclipse_arch}
-%attr(755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux/%{_eclipse_arch}/libswt-atk-gtk-*.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux/%{_eclipse_arch}/libswt-awt-gtk-*.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux/%{_eclipse_arch}/libswt-gnome-gtk-*.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux/%{_eclipse_arch}/libswt-gtk-*.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux/%{_eclipse_arch}/libswt-kde-gtk*.so
-#attr(755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux/%{_eclipse_arch}/libswt-mozilla-gtk-*.so
-%attr(755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/os/linux/%{_eclipse_arch}/libswt-pi-gtk-*.so
-%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/ws
-%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/META-INF
-%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/about.html
-%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/cpl-v10.html
-%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/fragment.properties
-%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/fragment.xml
-%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/lgpl-v21.txt
-%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk_*.*.*/mpl-v11.txt
-
+%{_libdir}/%{name}/plugins/org.eclipse.search_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.team.core_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_*.*.*
@@ -227,29 +280,60 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/plugins/org.eclipse.text_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.tomcat_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.browser_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.cheatsheets_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.console_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.editors_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.externaltools_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.forms_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.ide_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.ide.application_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.intro_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.intro.universal_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.navigator_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.navigator.resources_*.*.*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.net_*.*.*
 %{_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_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.update.core_*.*.*
-
-%dir %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*
-%dir %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os
-%dir %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os/linux
-%dir %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os/linux/%{_eclipse_arch}
-%attr(755,root,root) %{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/os/linux/%{_eclipse_arch}/libupdate.so
-%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/about.html
-%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*/fragment.xml
-
+%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.update.ui_*.*.*
 %{_libdir}/%{name}/plugins/org.junit_*.*.*
+%{_libdir}/%{name}/plugins/org.junit4_*.*.*
+%{_libdir}/%{name}/plugins/org.mortbay.jetty_*.*.*
+
+%if 1
+%{_libdir}/%{name}/features/org.eclipse.cvs.source_*
+%{_libdir}/%{name}/features/org.eclipse.jdt.source_*
+%{_libdir}/%{name}/features/org.eclipse.pde.source_*
+%{_libdir}/%{name}/features/org.eclipse.platform.source_*
+%{_libdir}/%{name}/features/org.eclipse.rcp.source_*
+%{_libdir}/%{name}/plugins/javax.servlet.jsp.source_*
+%{_libdir}/%{name}/plugins/javax.servlet.source_*
+%{_libdir}/%{name}/plugins/org.apache.ant.source_*
+%{_libdir}/%{name}/plugins/org.apache.commons.el.source_*
+%{_libdir}/%{name}/plugins/org.apache.commons.logging.source_*
+%{_libdir}/%{name}/plugins/org.apache.jasper.source_*
+%{_libdir}/%{name}/plugins/org.apache.lucene.analysis.source_*
+%{_libdir}/%{name}/plugins/org.apache.lucene.source_*
+%{_libdir}/%{name}/plugins/org.eclipse.cvs.source_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.source_*
+%{_libdir}/%{name}/plugins/org.eclipse.pde.source_*
+%{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*
+%{_libdir}/%{name}/plugins/org.eclipse.platform.source_*
+%{_libdir}/%{name}/plugins/org.eclipse.rcp.source.linux.gtk.*
+%{_libdir}/%{name}/plugins/org.eclipse.rcp.source_*
+%{_libdir}/%{name}/plugins/org.junit.source_*
+%{_libdir}/%{name}/plugins/org.mortbay.jetty.source_*
+%endif
+
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/features
+%dir %{_datadir}/%{name}/plugins
+%{_datadir}/%{name}/.eclipseextension