X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=eclipse.spec;h=7676aad70ad4c0168beb12648301289a8c29a7cc;hb=1957eb3027068ad4841846be2f876fde21d03154;hp=c3f5fef6ad47070da97c55be146ce72ae4a11919;hpb=ecfc810421593f9c78f506849edc72021eeb55af;p=packages%2Feclipse.git

diff --git a/eclipse.spec b/eclipse.spec
index c3f5fef..7676aad 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,66 +1,72 @@
 # 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.
+# - make use of eclipse-swt package
+#   and add proper provides, obsoletes, conflicts etc. where needed.
+#   This will make building such things like Azureus possible without having
+#   whole Eclipse suite installed.
+# - there are unpackaged source files, -devel?
 #
-%define		_ver_major	3.2
-%define		_ver_minor	1
-%define		_ver_rc		RC5
-%define		_buildid	200605191206
+%define		ver_major	3.3.1.1
+%define		buildid	200710231652
 #
 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.%{_ver_rc}_%{_buildid}.1
-#Release:	1
+Version:	%{ver_major}
+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:	3ac98928d84d52c04f95e3cb45af66ff
+Source0:	http://download.eclipse.org/eclipse/downloads/drops/R-%{ver_major}-%{buildid}/%{name}-sourceBuild-srcIncluded-%{ver_major}.zip
+# Source0-md5:	593b56fce7d1f1f799e87365cafefbef
 Source1:	%{name}.desktop
-Patch0:		%{name}-core_resources-makefile.patch
-Patch1:		%{name}-build.patch
 URL:		http://www.eclipse.org/
 BuildRequires:	ant >= 1.6.1
-BuildRequires:	jdk >= 1.4
+BuildRequires:	ant-apache-regexp
+BuildRequires:	jdk >= 1.6
 BuildRequires:	pkgconfig
+BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	sed
 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/')
+%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
-%patch0 -p0
-%patch1 -p0
+
+# Build Id - it's visible in couple places in gui
+# TODO: just patch build.xml not every single file
+find . '(' -name 'config.ini' -o -name 'about.mappings' ')' -type f -print \
+    | xargs %{__sed} -i -e 's/=@build@/=PLD %{name}-%{version}-%{release}/'
 
 %build
 unset CLASSPATH || :
 export JAVA_HOME=%{java_home}
 
-./build -os linux -ws gtk -arch %{_eclipse_arch} -target compile -java5home %{_libdir}/java
+./build -os linux -ws gtk -arch %{eclipse_arch} -target compile
 
 export JAVA_INC="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
 
 %{__make} -C plugins/org.eclipse.core.filesystem/natives/unix/linux/ \
+    OPT_FLAGS="%{rpmcflags} $JAVA_INC" \
     CFLAGS="%{rpmcflags} $JAVA_INC" \
     LDFLAGS="%{rpmldflags}"
 
@@ -76,29 +82,51 @@ 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 -java5home %{_libdir}/java
+./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}
+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
+# wrapper
 install -d $RPM_BUILD_ROOT%{_bindir}
 cat > $RPM_BUILD_ROOT%{_bindir}/eclipse << 'EOF'
 #!/bin/sh
-exec %{_libdir}/%{name}/eclipse $*
+exec %{_libdir}/%{name}/eclipse ${1:+"$@"}
 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
+	install features/org.eclipse.equinox.executable/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
+install -D features/org.eclipse.equinox.executable/bin/gtk/linux/x86/icon.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/eclipse-icon.xpm
+
+# not packaged -- remove
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.cvs.source_1.0.1.R33x_r20070802-7C79_9_KKG-mDM9e3H5D
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.jdt.source_3.3.1.r331_v20070629-7o7jE72EDlXAbqAcnbmyg1rf8RIL
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.pde.source_3.3.2.R33x_r20071022-7N7M4CYWLBCz-yHkMIuHN
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.platform.source_3.3.2.R33x_v20071022-_19UEksF-G8Yc6bUv3Dz
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/features/org.eclipse.rcp.source_3.3.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/javax.servlet.jsp.source_2.0.0.v200706191603
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/javax.servlet.source_2.4.0.v200706111738
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.apache.ant.source_1.7.0.v200706080842
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.apache.commons.el.source_1.0.0.v200706111724
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.apache.commons.logging.source_1.0.4.v200706111724
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.apache.jasper.source_5.5.17.v200706111724
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.apache.lucene.analysis.source_1.9.1.v200706181610
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.apache.lucene.source_1.9.1.v200706111724
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.cvs.source_1.0.1.R33x_r20070802-7C79_9_KKG-mDM9e3H5D
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.jdt.source_3.3.1.r331_v20070629-7o7jE72EDlXAbqAcnbmyg1rf8RIL
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.pde.source_3.3.2.R33x_r20071022-7N7M4CYWLBCz-yHkMIuHN
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.x86_3.3.2.R33x_v20071022-_19UEksF-G8Yc6bUv3Dz
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.platform.source_3.3.2.R33x_v20071022-_19UEksF-G8Yc6bUv3Dz
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.rcp.source.linux.gtk.x86_3.3.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.rcp.source_3.3.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.junit.source_3.8.2.v200706111738
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.mortbay.jetty.source_5.1.11.v200706111724
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -118,38 +146,41 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/icon.xpm
 %{_libdir}/%{name}/notice.html
 %{_libdir}/%{name}/readme
-%{_libdir}/%{name}/startup.jar
 %{_libdir}/%{name}/about.html
-#%{_libdir}/%{name}/about_files
+#%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.rcp.source_*.*.*
 %{_libdir}/%{name}/features/org.eclipse.sdk_*.*.*
 %dir %{_libdir}/%{name}/plugins
+%{_libdir}/%{name}/plugins/javax.servlet.jsp_*.*.*
+%{_libdir}/%{name}/plugins/javax.servlet_*.*.*
 %{_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.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_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.core.runtime_*.*.*
@@ -157,9 +188,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_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.launcher.gtk.linux.%{eclipse_arch}_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.registry_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.help_*.*.*
@@ -168,8 +208,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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.apt.*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.core.manipulation*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.debug_*.*.*
@@ -180,11 +219,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_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_*.*.*
@@ -196,23 +238,16 @@ 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.rcp.source_*.*.*
-%{_libdir}/%{name}/plugins/org.eclipse.rcp.source.linux.gtk.%{_eclipse_arch}_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*.*.*
-%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{_eclipse_arch}_*.*.*.jar
-%{_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.swt.gtk.linux.%{eclipse_arch}_*.*.*
+%{_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_*.*.*
@@ -222,14 +257,19 @@ 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_*.*.*
@@ -238,11 +278,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_*.*.*
 %{_libdir}/%{name}/plugins/org.eclipse.update.core_*.*.*
-%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*.*.*.jar
+%{_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_*.*.*
 
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/features