From 7c06b6962f3f7f01e777db850f8c8c65682e56a1 Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Mon, 30 Jan 2012 15:49:04 +0100 Subject: [PATCH] Update to Eclipse 3.8 I20120123-0800 --- .gitignore | 2 ++ eclipse.spec | 58 ++++++++++++++++++++++++++++++++++++---------------- sources | 4 ++-- 3 files changed, 44 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index e473392..574a7df 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ eclipse-build-* *.rpm eclipse-build-db208c33d1a67591d17b02148ae7948fd178a80d.tar.xz eclipse-build-eb76edf3fb5bbeb115c59d1b076f4821a6d47d74.tar.xz +eclipse-3.8.0-M4c-src.tar.bz2 +eclipse-build-c7f168527c3ed0495e614dd21244285a57ca6e5c.tar.xz diff --git a/eclipse.spec b/eclipse.spec index 4790f15..3ddbde3 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,12 +1,12 @@ Epoch: 1 %global eclipse_major 3 -%global eclipse_minor 7 +%global eclipse_minor 8 %global eclipse_majmin %{eclipse_major}.%{eclipse_minor} -%global eclipse_micro 1 +%global eclipse_micro 0 %global initialize 1 -%global download_url http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/ -%global eb_sha1 d5cb0d56c6cc3d6ec5a8a3df03ee383fc89106cb +%global download_url http://download.eclipse.org/technology/linuxtools/eclipse-build/3.8.x/ +%global eb_sha1 c7f168527c3ed0495e614dd21244285a57ca6e5c # FIXME: update java packaging guidelines for this. See # fedora-devel-java-list discussion in September 2008. @@ -17,12 +17,12 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 16%{?dist} +Release: 0.M4c%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ Source0: %{download_url}eclipse-build-%{eb_sha1}.tar.xz -Source1: %{download_url}eclipse-3.7.1-src.tar.bz2 +Source1: %{download_url}eclipse-3.8.0-M4c-src.tar.bz2 Source2: eclipse-reconciler.sh Source4: macros.%{name} Source5: http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi/3.6.0.v20100517/org.eclipse.osgi-3.6.0.v20100517.pom @@ -45,21 +45,24 @@ BuildRequires: mesa-libGLU-devel BuildRequires: cairo >= 1.0 BuildRequires: unzip BuildRequires: desktop-file-utils -BuildRequires: java-devel >= 1.6.0 +BuildRequires: java-devel >= 1.7.0 BuildRequires: java-javadoc BuildRequires: libXt-devel BuildRequires: webkitgtk-devel -BuildRequires: icu4j-eclipse >= 1:4.4.2-2 -BuildRequires: tomcat-lib >= 7.0.22-2 +BuildRequires: icu4j-eclipse >= 1:4.4.2.2-9 +BuildRequires: tomcat-lib >= 7.0.25-2 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf +BuildRequires: ant-scripts BuildRequires: jsch >= 0:0.1.41 BuildRequires: apache-commons-el BuildRequires: apache-commons-logging BuildRequires: apache-commons-codec BuildRequires: jakarta-commons-httpclient -BuildRequires: jetty >= 6.1.24-1 +BuildRequires: felix-gogo-command >= 0.12 +BuildRequires: felix-gogo-shell +BuildRequires: jetty >= 8 BuildRequires: lucene >= 2.9.4-5 BuildRequires: lucene-contrib >= 2.9.4-5 BuildRequires: junit >= 3.8.1-3jpp @@ -94,7 +97,7 @@ SWT Library for GTK+-2.0. Summary: Eclipse Rich Client Platform Group: Development/Languages Requires: %{name}-swt = %{epoch}:%{version}-%{release} -Requires: icu4j-eclipse >= 1:4.4.2-2 +Requires: icu4j-eclipse >= 1:4.4.2.2-9 Requires: java >= 1.6.0 %description rcp @@ -107,11 +110,15 @@ Requires: initscripts Requires: %{name}-rcp = %{epoch}:%{version}-%{release} Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net Requires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf +Requires: ant-scripts Requires: apache-commons-el Requires: apache-commons-logging Requires: apache-commons-codec -Requires: tomcat-lib >= 7.0.22-2 -Requires: jetty >= 6.1.24-1 +Requires: jakarta-commons-httpclient +Requires: tomcat-lib >= 7.0.25-2 +Requires: felix-gogo-command >= 0.12 +Requires: felix-gogo-shell +Requires: jetty >= 8 Requires: jsch >= 0.1.41 Requires: lucene >= 2.9.4-5 Requires: lucene-contrib >= 2.9.4-5 @@ -162,10 +169,11 @@ Eclipse Plugin Development Environment. This package is required for developing Eclipse plugins. %prep +export JAVA_HOME=%{java_home} %setup -q -n eclipse-build-%{eb_sha1} cp %{SOURCE1} . ant applyPatches -pushd build/eclipse-3.7.1-src +pushd build/eclipse-3.8.0-M4c-src # Use our system-installed javadocs, reference only what we built, and # don't like to osgi.org docs (FIXME: maybe we should package them?) @@ -203,6 +211,7 @@ export JAVA_HOME=%{java_home} ant provision.cvs %install +export JAVA_HOME=%{java_home} ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -Dmultilib=true installSDKinDropins # We don't need icon.xpm @@ -448,6 +457,8 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/plugins/org.eclipse.core.runtime_* %{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.auth_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.app_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.bidi_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.console_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.common_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.* @@ -500,8 +511,13 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/plugins/org.apache.juli_* %{_libdir}/%{name}/plugins/org.apache.el_* %{_libdir}/%{name}/plugins/org.apache.ant_* +%{_libdir}/%{name}/plugins/org.apache.commons.codec_* %{_libdir}/%{name}/plugins/org.apache.commons.el_* +%{_libdir}/%{name}/plugins/org.apache.commons.httpclient_* %{_libdir}/%{name}/plugins/org.apache.commons.logging_* +%{_libdir}/%{name}/plugins/org.apache.felix.gogo.command_* +%{_libdir}/%{name}/plugins/org.apache.felix.gogo.runtime_* +%{_libdir}/%{name}/plugins/org.apache.felix.gogo.shell_* %{_libdir}/%{name}/plugins/org.apache.lucene.core_* %{_libdir}/%{name}/plugins/org.apache.lucene.analysis_* %{_libdir}/%{name}/plugins/org.eclipse.ant.core_* @@ -568,8 +584,13 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/plugins/org.eclipse.update.core_* %{_libdir}/%{name}/plugins/org.eclipse.update.scheduler_* %{_libdir}/%{name}/plugins/org.eclipse.update.ui_* -%{_libdir}/%{name}/plugins/org.mortbay.jetty.util_* -%{_libdir}/%{name}/plugins/org.mortbay.jetty.server_* +%{_libdir}/%{name}/plugins/org.eclipse.jetty.util_* +%{_libdir}/%{name}/plugins/org.eclipse.jetty.server_* +%{_libdir}/%{name}/plugins/org.eclipse.jetty.http_* +%{_libdir}/%{name}/plugins/org.eclipse.jetty.continuation_* +%{_libdir}/%{name}/plugins/org.eclipse.jetty.io_* +%{_libdir}/%{name}/plugins/org.eclipse.jetty.security_* +%{_libdir}/%{name}/plugins/org.eclipse.jetty.servlet_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.initializer_* %{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_* %{_libdir}/%{name}/plugins/org.eclipse.cvs_* @@ -623,8 +644,6 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/plugins/org.eclipse.ecf_* %{_libdir}/%{name}/plugins/org.eclipse.ecf.filetransfer_* %{_libdir}/%{name}/plugins/org.eclipse.ecf.identity_* -%{_libdir}/%{name}/plugins/org.apache.commons.codec_* -%{_libdir}/%{name}/plugins/org.apache.commons.httpclient_* %{_libdir}/%{name}/plugins/org.sat4j.core_* %{_libdir}/%{name}/plugins/org.sat4j.pb_* # Put this in -platform since we're putting the p2 stuff here @@ -642,6 +661,9 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/dropins/sdk %changelog +* Mon Jan 30 2012 Krzysztof Daniel 1:3.8.0-0.M4c +- Update to Eclipse 3.8 I20120123-0800 + * Fri Jan 20 2012 Sami Wagiaalla 1:3.7.1-16 - Remove ORBit-2 requirement. diff --git a/sources b/sources index e414c8d..4d4e38a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e93946a256ba9bf468fc1588aab60e20 eclipse-3.7.1-src.tar.bz2 -8a54dcc192ea6fecf3f946f907f531c6 eclipse-build-d5cb0d56c6cc3d6ec5a8a3df03ee383fc89106cb.tar.xz +2964b7c0180f5f2371c9839ff41bc309 eclipse-3.8.0-M4c-src.tar.bz2 +d348602221a85fb513b26edee53ef9b8 eclipse-build-c7f168527c3ed0495e614dd21244285a57ca6e5c.tar.xz