From bbe279583d9c0b9b01bb85ac672cc9cf00588b8d Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Apr 10 2012 16:42:26 +0000 Subject: Pick up Eclipse 4.2. Conflicts: .gitignore eclipse.spec sources --- diff --git a/.gitignore b/.gitignore index 6f6c357..9e5c51a 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ eclipse-3.8.0-I20120306-0800-src.tar.bz2 eclipse-build-85830ed757416af1ca59aa1c43dce00791d12241.tar.xz eclipse-3.8.0-I20120314-1800-src.tar.bz2 eclipse-build-2c0f2ac34e3aee110187aa1dea28430bec724bdb.tar.xz +eclipse-4.2.0-I20120405-1114-src.tar.bz2 +eclipse-build-5b8ee4c44320ee145596a3ce98fef1aa199055dd.tar.xz \ No newline at end of file diff --git a/eclipse.spec b/eclipse.spec index 3783986..057d2ed 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,13 +1,15 @@ 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 5b8ee4c44320ee145596a3ce98fef1aa199055dd +%global build_id I20120405-1114 +%global eclipse_version %{eclipse_majmin}.%{eclipse_micro} +%global emf_version 2.8.0 # FIXME: update java packaging guidelines for this. See # fedora-devel-java-list discussion in September 2008. @@ -17,13 +19,13 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse -Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 0.21.I201203201400%{?dist} +Version: %{eclipse_version} +Release: 0.9.I201204051114%{?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-%{version}-%{build_id}-src.tar.bz2 +Source1: %{download_url}eclipse-%{eclipse_version}-%{build_id}-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 @@ -48,7 +50,7 @@ BuildRequires: mesa-libGLU-devel BuildRequires: cairo >= 1.0 BuildRequires: unzip BuildRequires: desktop-file-utils -BuildRequires: java-devel >= 1.7.0 +BuildRequires: java-devel >= 1:1.7.0 BuildRequires: java-javadoc BuildRequires: libXt-devel BuildRequires: webkitgtk-devel @@ -73,6 +75,10 @@ BuildRequires: hamcrest >= 0:1.1-9.2 BuildRequires: sat4j >= 2.3.0-1 BuildRequires: objectweb-asm >= 3.3.1-1 BuildRequires: zip +BuildRequires: sac +BuildRequires: batik +BuildRequires: xml-commons-apis +BuildRequires: atinject >= 1-6 %if 0%{?rhel} >= 6 ExclusiveArch: %{ix86} x86_64 @@ -84,6 +90,7 @@ environments (IDEs), server-side applications, desktop applications, and everything in between. %package swt +Version: %{eclipse_version} Summary: SWT Library for GTK+-2.0 Group: Text Editors/Integrated Development Environments (IDE) # %{_libdir}/java directory owned by jpackage-utils @@ -94,21 +101,34 @@ Requires: webkitgtk %description swt SWT Library for GTK+-2.0. +%package emf-core +Version: %{emf_version} +Summary: Eclipse Modeling Framework Core +Group: Development/Languages +Conflicts: eclipse-emf < 2.8.0-0.5 + +%description emf-core +Eclipse Modeling Framework Core + + %package rcp +Version: %{eclipse_version} Summary: Eclipse Rich Client Platform Group: Development/Languages -Requires: %{name}-swt = %{epoch}:%{version}-%{release} +Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release} Requires: icu4j-eclipse >= 1:4.4.2.2-11 -Requires: java >= 1.6.0 +Requires: java >= 1:1.7.0 +Requires: %{name}-emf-core = %{epoch}:%{emf_version}-%{release} Provides: osgi(system.bundle) %description rcp Eclipse Rich Client Platform %package platform +Version: %{eclipse_version} Summary: Eclipse platform common files Group: Text Editors/Integrated Development Environments (IDE) -Requires: %{name}-rcp = %{epoch}:%{version}-%{release} +Requires: %{name}-rcp = %{epoch}:%{eclipse_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 @@ -120,44 +140,51 @@ Requires: tomcat-lib >= 7.0.25-3 Requires: felix-gogo-command >= 0.12 Requires: felix-gogo-shell >= 0.10.0-3 Requires: jetty >= 8.1.0-1 -Requires: jsch >= 0.1.41 +Requires: jsch >= 0.1.46-2 Requires: lucene >= 2.9.4-5 Requires: lucene-contrib >= 2.9.4-5 Requires: sat4j >= 2.3.0-1 -Provides: eclipse-cvs-client = 1:%{version}-%{release} +Requires: sac +Requires: xml-commons-apis +Requires: batik +Requires: atinject >= 1-6 +Provides: eclipse-cvs-client = 1:%{eclipse_version}-%{release} Obsoletes: eclipse-cvs-client < 1:3.3.2-20 %description platform 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 +Version: %{eclipse_version} Summary: Eclipse Java Development Tools Group: Text Editors/Integrated Development Environments (IDE) -Requires: %{name}-platform = %{epoch}:%{version}-%{release} -Requires: %{name}-cvs-client = %{epoch}:%{version}-%{release} +Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release} +Requires: %{name}-cvs-client = %{epoch}:%{eclipse_version}-%{release} Requires: junit >= 4.10-4 Requires: jakarta-commons-httpclient Requires: java-javadoc -Requires: java-devel +Requires: java-devel >= 1:1.7.0 %description jdt Eclipse Java Development Tools. This package is required to use Eclipse for developing software written in the Java programming language. %package pde +Version: %{eclipse_version} Summary: Eclipse Plugin Development Environment Group: Text Editors/Integrated Development Environments (IDE) -Provides: eclipse = %{epoch}:%{version}-%{release} -Provides: eclipse-sdk = %{epoch}:%{version}-%{release} -Requires: %{name}-platform = %{epoch}:%{version}-%{release} -Requires: %{name}-jdt = %{epoch}:%{version}-%{release} +Provides: eclipse = %{epoch}:%{eclipse_version}-%{release} +Provides: eclipse-sdk = %{epoch}:%{eclipse_version}-%{release} +Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release} +Requires: %{name}-jdt = %{epoch}:%{eclipse_version}-%{release} Requires: objectweb-asm >= 3.3.1-1 Requires: hamcrest >= 0:1.1-9.2 # For PDE Build wrapper script + creating jars Requires: zip Requires: bash -Provides: %{name}-pde-runtime = 1:%{version}-%{release} +Provides: %{name}-pde-runtime = 1:%{eclipse_version}-%{release} Obsoletes: %{name}-pde-runtime < 1:3.3.2-20 %description pde @@ -169,7 +196,7 @@ export JAVA_HOME=%{java_home} %setup -q -n eclipse-build-%{eb_sha1} cp %{SOURCE1} . ant applyPatches -pushd build/eclipse-%{version}-%{build_id}-src +pushd build/eclipse-%{eclipse_version}-%{build_id}-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?) @@ -353,6 +380,14 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/swt.jar %{_libdir}/java/swt.jar +%files -n eclipse-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} @@ -360,15 +395,16 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/configuration/config.ini %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info %dir %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator -%ifnarch ppc ppc64 -%{_libdir}/%{name}/about.html -%endif -%ifarch x86_64 -%{_libdir}/%{name}/about_files -%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_* @@ -378,7 +414,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_* @@ -388,15 +423,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}/* @@ -410,9 +466,6 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/.eclipseproduct %config %{_libdir}/%{name}/eclipse.ini %config %{_sysconfdir}/eclipse.ini -%ifnarch ppc ppc64 -%{_libdir}/%{name}/about_files -%endif %{_sysconfdir}/rpm/macros.%{name} %{_datadir}/applications/* %{_datadir}/pixmaps/* @@ -422,15 +475,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_* @@ -438,21 +497,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_* @@ -466,7 +522,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_* @@ -496,14 +551,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_* @@ -566,6 +634,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? @@ -582,6 +652,14 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/dropins/sdk %changelog +* Tue Apr 10 2012 Krzysztof Daniel 1:4.2.0-0.9.I201204051114 +- Picked rawhide 4.2 package. + +* Fri Apr 6 2012 Krzysztof Daniel 1:4.2.0-0.6.I201204051114 +- Update to I20120405-1114 upstream Eclipse build. +- Update to latest e-b +- Bug 810552 - JSch Requires should be versioned + * Mon Apr 2 2012 Krzysztof Daniel 1:3.8.0-0.21.I201203201400 - pdebuild script installed into %{_bindir} diff --git a/macros.eclipse b/macros.eclipse index 22003fa..038b033 100644 --- a/macros.eclipse +++ b/macros.eclipse @@ -1,4 +1,7 @@ # RPM macros for eclipse packages. # -%_eclipse_base %{_libdir}/eclipse +# There is no guarantee that %%{_libdir} will resolve properly on +# noarch so we use this macro. +%_eclipse_bits %(rpm --eval %{__isa_bits} | sed 's/32//') +%_eclipse_base %{_prefix}/lib%{_eclipse_bits}/eclipse diff --git a/sources b/sources index c575922..e8fac3e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -a6c15f8154be2768e52c63e1ed5aea6c eclipse-3.8.0-I20120320-1400-src.tar.bz2 -6a26f05f61e1af4a438a5d249f7c30d3 eclipse-build-6b26abde60e28f7c5a4cd9f26bf47dce91bfd5e7.tar.xz +d93c53bfaa0a09b8f57e86a588db7ebd eclipse-4.2.0-I20120405-1114-src.tar.bz2 +9bbd7b12c404f2500a9097f94c51a6f1 eclipse-build-5b8ee4c44320ee145596a3ce98fef1aa199055dd.tar.xz