[eclipse] Update to 4.2.

Krzysztof Daniel kdaniel at fedoraproject.org
Thu Mar 29 13:12:37 UTC 2012


commit 5110384c64f5fd7ec187b2ce830366d5f92cfe07
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Thu Mar 29 15:12:27 2012 +0200

    Update to 4.2.

 eclipse.spec |  109 +++++++++++++++++++++++++++++++++++++++++++++++++---------
 sources      |    2 -
 2 files changed, 92 insertions(+), 19 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index e6c896f..4395662 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,13 +1,13 @@
 Epoch:  1
 
-%global eclipse_major   3
-%global eclipse_minor   8
+%global eclipse_major   4
+%global eclipse_minor   2
 %global eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
 %global eclipse_micro   0
 %global initialize      1
-%global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/3.8.x/
-%global eb_sha1         6b26abde60e28f7c5a4cd9f26bf47dce91bfd5e7
-%global build_id        I20120320-1400
+%global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/
+%global eb_sha1         9bf99aad0f4c76d5936616bd9612d6238b8468f0
+%global build_id        fa15ab
 
 # FIXME:  update java packaging guidelines for this.  See
 # fedora-devel-java-list discussion in September 2008.
@@ -18,7 +18,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.21.I201203201400%{?dist}
+Release:        0.1.fa15ab%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -71,7 +71,12 @@ BuildRequires: junit >= 4.10-4
 BuildRequires: hamcrest >= 0:1.1-9.2
 BuildRequires: sat4j >= 2.3.0-1
 BuildRequires: objectweb-asm >= 3.3.1-1
+BuildRequires: eclipse-emf >= 2.8.0-0.2
 BuildRequires: zip
+BuildRequires: sac
+BuildRequires: batik
+BuildRequires: xml-commons-apis
+BuildRequires: atinject
 
 %if 0%{?rhel} >= 6
 ExclusiveArch: %{ix86} x86_64
@@ -93,12 +98,21 @@ Requires:       webkitgtk
 %description swt
 SWT Library for GTK+-2.0.
 
+%package        emf-core
+Summary:        Eclipse Modeling Framework Core
+Group:          Development/Languages
+Version:        2.8.0
+%description    emf-core
+Eclipse Modeling Framework Core
+
+
 %package        rcp
 Summary:        Eclipse Rich Client Platform
 Group:          Development/Languages
 Requires:       %{name}-swt = %{epoch}:%{version}-%{release}
 Requires:       icu4j-eclipse >= 1:4.4.2.2-11
 Requires:       java >= 1.6.0
+Requires:       %{name}-emf-core
 Provides:       osgi(system.bundle)
 
 %description    rcp
@@ -123,6 +137,10 @@ Requires: jsch >= 0.1.41
 Requires: lucene >= 2.9.4-5
 Requires: lucene-contrib >= 2.9.4-5
 Requires: sat4j >= 2.3.0-1
+Requires: sac
+Requires: xml-commons-apis
+Requires: batik
+Requires: atinject
 Provides: eclipse-cvs-client = 1:%{version}-%{release}
 Obsoletes: eclipse-cvs-client < 1:3.3.2-20
 
@@ -130,6 +148,7 @@ Obsoletes: eclipse-cvs-client < 1:3.3.2-20
 The Eclipse Platform is the base of all IDE plugins.  This does not include the
 Java Development Tools or the Plugin Development Environment.
 
+
 %package        jdt
 Summary:        Eclipse Java Development Tools
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -348,6 +367,14 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/swt.jar
 %{_libdir}/java/swt.jar
 
+%files emf-core
+%{_libdir}/%{name}/features/org.eclipse.emf.common_*
+%{_libdir}/%{name}/features/org.eclipse.emf.ecore_*
+%{_libdir}/%{name}/plugins/org.eclipse.emf.common_*
+%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore_*
+%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.change_*
+%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.xmi_*
+
 %files rcp
 %dir %{_libdir}/%{name}/features
 %dir %{_datadir}/%{name}
@@ -363,7 +390,14 @@ rm -rf %{_bindir}/efj/
 %endif
 %{_libdir}/%{name}/readme
 %{_libdir}/%{name}/features/org.eclipse.rcp_*
+%{_libdir}/%{name}/features/org.eclipse.e4.rcp_*
 %{_libdir}/%{name}/plugins/com.ibm.icu_*
+%{_libdir}/%{name}/plugins/javax.inject_1.0.0.v20091030.jar
+%{_libdir}/%{name}/plugins/javax.xml_1.3.4.v200806030440.jar
+%{_libdir}/%{name}/plugins/org.apache.batik.css_*
+%{_libdir}/%{name}/plugins/org.apache.batik.util.gui_*
+%{_libdir}/%{name}/plugins/org.apache.batik.util_*
+%{_libdir}/%{name}/plugins/org.apache.geronimo.specs.geronimo-annotation_1.1_spec_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.commands_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.databinding_*
@@ -373,7 +407,6 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/plugins/org.eclipse.core.expressions_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.jobs_*
 %{_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_*
@@ -383,15 +416,36 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.registry_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.util_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.core.commands_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.core.contexts_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.core.di.extensions_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.core.di_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.core.services_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.bindings_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.core_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.swt.theme_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.swt_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.di_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.model.workbench_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.services_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.widgets_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.addons.swt_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.renderers.swt_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.swt_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench3_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench_*
 %{_libdir}/%{name}/plugins/org.eclipse.help_*
 %{_libdir}/%{name}/plugins/org.eclipse.jface_*
 %{_libdir}/%{name}/plugins/org.eclipse.jface.databinding_*
 %{_libdir}/%{name}/plugins/org.eclipse.osgi_*
 %{_libdir}/%{name}/plugins/org.eclipse.rcp_*
 %{_libdir}/%{name}/plugins/org.eclipse.ui_*
+%{_libdir}/%{name}/plugins/org.eclipse.ui.views_*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_*
 %{_libdir}/%{name}/plugins/org.eclipse.update.configurator_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator_*
+%{_libdir}/%{name}/plugins/org.w3c.css.sac_*
+%{_libdir}/%{name}/plugins/org.w3c.dom.svg_*
 %{_javadir}/%{name}
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
@@ -417,15 +471,21 @@ rm -rf %{_bindir}/efj/
 %dir %{_libdir}/%{name}/dropins
 %dir %{_datadir}/%{name}/dropins
 %{_libdir}/%{name}/features/org.eclipse.platform_*
+%{_libdir}/%{name}/features/org.eclipse.e4.rcp_*
 %{_libdir}/%{name}/plugins/com.jcraft.jsch_*
 %{_libdir}/%{name}/plugins/org.eclipse.jdt.core_*
 %{_libdir}/%{name}/plugins/javax.servlet_*
 %{_libdir}/%{name}/plugins/javax.servlet.jsp_*
 %{_libdir}/%{name}/plugins/javax.el_*
+%{_libdir}/%{name}/plugins/javax.inject_1.0.0.v20091030.jar
+%{_libdir}/%{name}/plugins/javax.xml_1.3.4.v200806030440.jar
 %{_libdir}/%{name}/plugins/org.apache.tomcat_*
 %{_libdir}/%{name}/plugins/org.apache.juli_*
 %{_libdir}/%{name}/plugins/org.apache.el_*
 %{_libdir}/%{name}/plugins/org.apache.ant_*
+%{_libdir}/%{name}/plugins/org.apache.batik.css_*
+%{_libdir}/%{name}/plugins/org.apache.batik.util.gui_*
+%{_libdir}/%{name}/plugins/org.apache.batik.util_*
 %{_libdir}/%{name}/plugins/org.apache.commons.codec_*
 %{_libdir}/%{name}/plugins/org.apache.commons.el_*
 %{_libdir}/%{name}/plugins/org.apache.commons.httpclient_*
@@ -433,21 +493,18 @@ rm -rf %{_bindir}/efj/
 %{_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.geronimo.specs.geronimo-annotation_1.1_spec_*
 %{_libdir}/%{name}/plugins/org.apache.lucene.core_*
 %{_libdir}/%{name}/plugins/org.apache.lucene.analysis_*
 %{_libdir}/%{name}/plugins/org.eclipse.ant.core_*
 %{_libdir}/%{name}/plugins/org.eclipse.compare_*
 %{_libdir}/%{name}/plugins/org.eclipse.compare.core_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.boot_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.externaltools_*
 %{_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.net_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.net.linux.*
-%ifarch %{ix86}
-%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*
-%endif
 %{_libdir}/%{name}/plugins/org.eclipse.core.resources_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_*
 %{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.registry_*
@@ -461,7 +518,6 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.http.servlet_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.jsp.jasper_*
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.jsp.jasper.registry_*
-%{_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_*
@@ -491,14 +547,27 @@ rm -rf %{_bindir}/efj/
 %{_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.compatibility_*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*
-%{_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.eclipse.e4.core.commands_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.core.contexts_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.core.di.extensions_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.core.di_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.core.services_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.bindings_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.core_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.swt.theme_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.swt_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.di_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.model.workbench_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.services_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.widgets_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.addons.swt_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.renderers.swt_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.swt_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench3_*
+%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench_*
 %{_libdir}/%{name}/plugins/org.eclipse.jetty.util_*
 %{_libdir}/%{name}/plugins/org.eclipse.jetty.server_*
 %{_libdir}/%{name}/plugins/org.eclipse.jetty.http_*
@@ -561,6 +630,8 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/plugins/org.eclipse.ecf.identity_*
 %{_libdir}/%{name}/plugins/org.sat4j.core_*
 %{_libdir}/%{name}/plugins/org.sat4j.pb_*
+%{_libdir}/%{name}/plugins/org.w3c.css.sac_*
+%{_libdir}/%{name}/plugins/org.w3c.dom.svg_*
 # Put this in -platform since we're putting the p2 stuff here
 %{_libdir}/%{name}/artifacts.xml
 # FIXME: should we ship content.xml for the platform?
@@ -576,6 +647,10 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/dropins/sdk
 
 %changelog
+* Thu Mar 29 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:2.8.0-0.1.fa15ab
+- Update to 4.2
+- Added eclipse-emf-core package.
+
 * Mon Mar 26 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:3.8.0-0.21.I201203201400
 - Added Provides: osgi(system.bundle)  to rcp package.
 
diff --git a/sources b/sources
index c575922..e69de29 100644
--- a/sources
+++ b/sources
@@ -1,2 +0,0 @@
-a6c15f8154be2768e52c63e1ed5aea6c  eclipse-3.8.0-I20120320-1400-src.tar.bz2
-6a26f05f61e1af4a438a5d249f7c30d3  eclipse-build-6b26abde60e28f7c5a4cd9f26bf47dce91bfd5e7.tar.xz


More information about the scm-commits mailing list