diff --git a/eclipse-feature-plugins-to-category-ius.patch b/eclipse-feature-plugins-to-category-ius.patch index 5e797f8..dbf2b48 100644 --- a/eclipse-feature-plugins-to-category-ius.patch +++ b/eclipse-feature-plugins-to-category-ius.patch @@ -1,26 +1,5 @@ -From 6dd34f0b0365e0529f3852c688bfd99519f035d1 Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Thu, 6 Dec 2018 11:38:58 +0000 -Subject: [PATCH] IU inclusion changes: - -* Change features bundling third-party modules to feature requirements -* Make some IU name changes to accommodate for distro-specific packaging ---- - .../org.eclipse.jdt-feature/feature.xml | 114 ++----------- - .../org.eclipse.pde-feature/feature.xml | 16 +- - .../bundles/org.eclipse.jdt.doc.isv/pom.xml | 2 +- - .../bundles/org.eclipse.pde.doc.user/pom.xml | 2 +- - .../org.eclipse.platform.doc.isv/pom.xml | 10 +- - .../org.eclipse.help-feature/feature.xml | 130 +++------------ - .../org.eclipse.platform-feature/feature.xml | 18 +-- - .../org.eclipse.sdk.tests/feature.xml | 58 ++----- - .../org.eclipse.test-feature/feature.xml | 56 +------ - .../org.eclipse.tips.feature/feature.xml | 11 +- - .../features/org.eclipse.e4.rcp/feature.xml | 150 ++---------------- - 11 files changed, 87 insertions(+), 480 deletions(-) - diff --git a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml -index e12ef6a13..6deae2a13 100644 +index d874d5a13..c15c86ffa 100644 --- a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml +++ b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml @@ -19,6 +19,23 @@ @@ -152,7 +131,7 @@ index e12ef6a13..6deae2a13 100644 id="org.eclipse.jdt.doc.user" download-size="0" diff --git a/eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml b/eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml -index 57a58c6d5..a9c3e2c9b 100644 +index d1e74d8ee..788b4202d 100644 --- a/eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml +++ b/eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml @@ -21,6 +21,8 @@ @@ -186,16 +165,10 @@ index 57a58c6d5..a9c3e2c9b 100644 id="org.eclipse.pde.api.tools" download-size="0" diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml -index 5b9e03021..1702d4dc6 100644 +index 616bfa0b6..603dc94d6 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml -@@ -78,12 +78,12 @@ - - - eclipse-plugin -- javax.annotation -+ javax.annotation - 0.0.0 +@@ -83,7 +83,7 @@ eclipse-plugin @@ -204,15 +177,6 @@ index 5b9e03021..1702d4dc6 100644 0.0.0 -@@ -93,7 +93,7 @@ - - - eclipse-plugin -- javax.servlet -+ javax.servlet-api - 0.0.0 - - @@ -118,7 +118,7 @@ @@ -223,7 +187,7 @@ index 5b9e03021..1702d4dc6 100644 diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml -index 79fa77d7e..5f3d6f6d0 100644 +index c5ddcaf13..57b485135 100644 --- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml @@ -21,69 +21,6 @@ @@ -358,7 +322,7 @@ index 79fa77d7e..5f3d6f6d0 100644 + + -+ ++ + + + @@ -376,7 +340,7 @@ index 79fa77d7e..5f3d6f6d0 100644 + diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml -index 94f21e6f8..694d49dc1 100644 +index 84d4a38a9..070f86a63 100644 --- a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml @@ -19,6 +19,11 @@ @@ -419,7 +383,7 @@ index 94f21e6f8..694d49dc1 100644 id="org.eclipse.compare.core" download-size="0" diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml -index 6d7659ab9..23f4e6524 100644 +index b97274c8f..c0259a07b 100644 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml @@ -19,6 +19,15 @@ @@ -502,7 +466,7 @@ index 6d7659ab9..23f4e6524 100644 id="org.eclipse.ui.tests.pluginchecks" download-size="0" diff --git a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml -index 1f422b76e..9e26326c3 100644 +index 6c7fa25fc..bc6bf6e9a 100644 --- a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml @@ -19,6 +19,14 @@ @@ -580,7 +544,7 @@ index 1f422b76e..9e26326c3 100644 - diff --git a/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml b/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml -index b8f52fe1a..a1d866a52 100644 +index f23dc6904..ff63f3901 100644 --- a/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml +++ b/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml @@ -32,6 +32,10 @@ @@ -607,7 +571,7 @@ index b8f52fe1a..a1d866a52 100644 - diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml -index 0ce4361be..ac28b73c2 100644 +index 767a93df9..293525308 100644 --- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml @@ -22,6 +22,23 @@ @@ -809,6 +773,42 @@ index 0ce4361be..ac28b73c2 100644 + +- ++ ++ ++ + + + +- ++ ++ ++ + + diff --git a/eclipse.spec b/eclipse.spec index 80629a4..5baf7b8 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,20 +1,20 @@ # Set to build Eclipse without circular dependency to eclipse-pde, API # generation and docs will not be built and a second run will be required, but # this is a way to bootstrap Eclipse on secondary archs. -%bcond_with bootstrap +%bcond_without bootstrap # Set this to avoid building contributor tools %bcond_without contrib_tools Epoch: 1 -%global eb_commit b056b40d26d052b788b790f27ead774ff804ab55 +%global eb_commit d041687bcf34d6c11f4ad2cf43aab5ad5a4c02a1 %global eclipse_rel %{version} %global eclipse_tag R-%{eclipse_rel}-202006040540 %global _jetty_version 9.4.31 %global _lucene_version 8.4.1 -%global _batik_version 1.11 +%global _batik_version 1.13 %ifarch %{ix86} %global eclipse_arch x86 @@ -42,14 +42,16 @@ Epoch: 1 # Glassfish EE APIs that moved to jakarta namespace %if 0%{?fedora} >= 33 %global _jakarta_annotations jakarta.annotation-api +%global _jakarta_servlet jakarta.servlet-api %else %global _jakarta_annotations javax.annotation-api +%global _jakarta_servlet javax.servlet-api %endif Summary: An open, extensible IDE Name: eclipse Version: 4.16 -Release: 9%{?dist} +Release: 10%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -167,7 +169,7 @@ BuildRequires: icu4j >= 1:65.1 BuildRequires: ant >= 1.10.5 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf BuildRequires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf ant-xz ant-junit5 -BuildRequires: jsch >= 0:0.1.46-2 +BuildRequires: jsch BuildRequires: apache-commons-logging BuildRequires: apache-commons-codec BuildRequires: apache-commons-jxpath @@ -253,7 +255,6 @@ Recommends: eclipse-usage Requires: ant >= 1.10.5 Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf Requires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf ant-xz ant-junit5 -Requires: jsch >= 0.1.46-2 Requires: apache-commons-logging Requires: apache-commons-codec Requires: apache-commons-jxpath @@ -345,8 +346,6 @@ Summary: Tools for Eclipse Contributors # No longer shipping tests Obsoletes: %{name}-tests < 1:4.14-2 -Requires: %{name}-platform = %{epoch}:%{version}-%{release} - %description contributor-tools This package contains tools specifically for Eclipse contributors. It includes SWT tools, E4 tools, Rel-Eng tools and Eclipse Test frameworks. @@ -450,6 +449,11 @@ sed -i -e 's/javax.annotation/%{_jakarta_annotations}/' eclipse-platform-parent/ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml \ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml \ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml +# javax.servlet -> jakarta.servlet-api +sed -i -e 's/javax.servlet\([^.]\)/%{_jakarta_servlet}\1/' \ + rt.equinox.bundles/features/org.eclipse.equinox.server.{jetty,simple}/feature.xml \ + eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml \ + eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml # Fix requirement on junit 4 sed -i -e 's/4.13.0,5.0.0/4.12.0,5.0.0/' eclipse.jdt.ui/org.eclipse.jdt.junit.core/src/org/eclipse/jdt/internal/junit/buildpath/BuildPathSupport.java @@ -614,10 +618,6 @@ dependencies/fake_ant_dependency.sh # Allow usage of javax.servlet.jsp 2.3. sed -i '/javax\.servlet\.jsp/ s/2\.3/2\.4/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF -# Use javax.servlet-api (Glassfish) instead of javax.servlet (Tomcat) -find -name feature.xml | xargs sed -i -e 's|"javax.servlet"|"javax.servlet-api"|' -sed -i -e "2iRequire-Bundle: javax.servlet-api" rt.equinox.bundles/bundles/org.eclipse.equinox.http.{jetty,servlet}/META-INF/MANIFEST.MF - # Fix constraint on gogo runtime sed -i -e '/org.apache.felix.service.command/s/;status=provisional//' rt.equinox.bundles/bundles/org.eclipse.equinox.console{,.ssh}/META-INF/MANIFEST.MF @@ -1065,6 +1065,10 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Wed Aug 19 2020 Mat Booth - 1:4.16-10 +- Rebuild against jakarta servlet API and updated batik +- Update eclipse-build snapshot + * Fri Aug 14 2020 Mat Booth - 1:4.16-9 - Restore explicit glassfish-annotation-api dep diff --git a/sources b/sources index 3ebba10..2a9ba70 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (org.eclipse.linuxtools.eclipse-build-b056b40d26d052b788b790f27ead774ff804ab55.tar.xz) = 8e781fe321597b257ecc9bfcefb7fb0955115c0d3188d4bff101218e562ef4a31e0abe1ef6afdd484e1afba50469a18cddd44ad835af3c0eda105214e4de9fb7 +SHA512 (org.eclipse.linuxtools.eclipse-build-d041687bcf34d6c11f4ad2cf43aab5ad5a4c02a1.tar.xz) = 6dbf351457c08c0b3865e4efdd79ff9aaa404d4b2aeeb531a750a9e59c54ba70f8765c8679b04bf1cb43d047b7214dad6de878a2bac54d33614abdda9f730ad8 SHA512 (eclipse-platform-sources-4.16.tar.xz) = e97d56f4ff7accca82993ebb8edf6cd012f20273f063c764134753dafb38972497521f2a3150c2650655c17149e135eccf781b536d50b382cd1e2fb41ec4a692