The package rpms/eclipse.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eclipse.git/commit/?id=357eef5d66....
Change:
-%ifarch %{arm}
Thanks.
Full change:
============
commit 357eef5d66af8f861332aefc2a0ed11f6a530819
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Tue Aug 25 17:06:20 2020 +0100
Rebuild against new jakarta-el,-jsp packages
Fix javadoc generation relying on Windows version of SWT
diff --git a/eclipse-feature-plugins-to-category-ius.patch
b/eclipse-feature-plugins-to-category-ius.patch
index dbf2b48..305eede 100644
--- a/eclipse-feature-plugins-to-category-ius.patch
+++ b/eclipse-feature-plugins-to-category-ius.patch
@@ -164,28 +164,6 @@ index d1e74d8ee..788b4202d 100644
<plugin
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 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
-@@ -83,7 +83,7 @@
- </requirement>
- <requirement>
- <type>eclipse-plugin</type>
-- <id>javax.el</id>
-+ <id>javax.el-api</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
-@@ -118,7 +118,7 @@
- </requirement>
- <requirement>
- <type>eclipse-plugin</type>
-- <id>org.apache.jasper.glassfish</id>
-+ <id>org.glassfish.web.javax.servlet.jsp</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
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 c5ddcaf13..57b485135 100644
--- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
@@ -321,12 +299,12 @@ index c5ddcaf13..57b485135 100644
unpack="false"/>
+ <requires>
-+ <import plugin="javax.el-api" />
++ <import plugin="javax.el" />
+ <import plugin="javax.servlet" />
+ <import plugin="javax.servlet.jsp" />
-+ <import plugin="com.sun.el.javax.el" />
++ <import plugin="com.sun.el" />
+ <import plugin="org.apache.commons.logging" />
-+ <import plugin="org.glassfish.web.javax.servlet.jsp" />
++ <import plugin="org.apache.jasper.glassfish" />
+ <import plugin="org.apache.lucene.analyzers-common" />
+ <import plugin="org.apache.lucene.core" />
+ <import plugin="org.apache.lucene.analyzers-smartcn" />
diff --git a/eclipse-pde-tp-support-droplets.patch
b/eclipse-pde-tp-support-droplets.patch
index 59ae65d..d4003b8 100644
--- a/eclipse-pde-tp-support-droplets.patch
+++ b/eclipse-pde-tp-support-droplets.patch
@@ -1,4 +1,4 @@
-From 7843458db4b359cbee040c17ddda21d5fa6ddd35 Mon Sep 17 00:00:00 2001
+From 6c608cd76dfabdc7cd57fe581eee1533ff82130a Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber(a)redhat.com>
Date: Thu, 7 Apr 2016 10:23:49 -0400
Subject: [PATCH] Support reading BundleInfo from p2 Droplets enabled
@@ -8,10 +8,11 @@ Subject: [PATCH] Support reading BundleInfo from p2 Droplets enabled
---
.../org.eclipse.pde.core/META-INF/MANIFEST.MF | 1 +
.../eclipse/pde/internal/core/P2Utils.java | 50 +++++++++++++++++--
- 2 files changed, 46 insertions(+), 5 deletions(-)
+ .../org.eclipse.pde.doc.user/pdeOptions.txt | 1 +
+ 3 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF
b/eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF
-index f045abd5b..864665785 100644
+index 27e51faa6..0735dc414 100644
--- a/eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF
+++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF
@@ -102,5 +102,6 @@ Require-Bundle:
@@ -114,6 +115,18 @@ index 696d2318f..7ab4596d5 100644
} catch (IOException e) {
PDECore.log(e);
return null;
+diff --git a/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
b/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
+index 523019ede..d25d89549 100644
+--- a/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
++++ b/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
+@@ -76,6 +76,7 @@
+ ;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.repository.tools/${dot.classes}
+ ;${rt.equinox.p2.bundles}/org.eclipse.equinox.p2.touchpoint.eclipse/${dot.classes}
+
;${rt.equinox.p2.bundles}/org.eclipse.equinox.simpleconfigurator.manipulator/${dot.classes}
++;${rt.equinox.p2.bundles}/org.eclipse.equinox.simpleconfigurator/${dot.classes}
+
+ -breakiterator
+ -use
--
-2.21.1
+2.26.2
diff --git a/eclipse.spec b/eclipse.spec
index 8638b3f..dd78c99 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -8,7 +8,7 @@
Epoch: 1
-%global eb_commit d041687bcf34d6c11f4ad2cf43aab5ad5a4c02a1
+%global eb_commit 2f6d1ff5950edd8c0b55bbcc93491bce269e4272
%global eclipse_rel %{version}
%global eclipse_tag R-%{eclipse_rel}-202006040540
@@ -16,12 +16,6 @@ Epoch: 1
%global _lucene_version 8.4.1
%global _batik_version 1.13
-%ifarch %{ix86}
- %global eclipse_arch x86
-%endif
-%ifarch %{arm}
- %global eclipse_arch arm
-%endif
%ifarch s390x x86_64 aarch64 ppc64le
%global eclipse_arch %{_arch}
%endif
@@ -42,16 +36,24 @@ 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
+%global _jakarta_servlet_api jakarta.servlet-api
+%global _jakarta_jsp_api javax.servlet.jsp-api
+%global _jakarta_jsp org.glassfish.web.jakarta.servlet.jsp
+%global _jakarta_el_api jakarta.el-api
+%global _jakarta_el org.glassfish.jakarta.el
%else
%global _jakarta_annotations javax.annotation-api
-%global _jakarta_servlet javax.servlet-api
+%global _jakarta_servlet_api javax.servlet-api
+%global _jakarta_jsp_api javax.servlet.jsp
+%global _jakarta_jsp org.glassfish.web.javax.servlet.jsp
+%global _jakarta_el_api javax.el-api
+%global _jakarta_el com.sun.el.javax.el
%endif
Summary: An open, extensible IDE
Name: eclipse
Version: 4.16
-Release: 11%{?dist}
+Release: 12%{?dist}
License: EPL-2.0
URL:
http://www.eclipse.org/
@@ -89,12 +91,6 @@ Patch12: eclipse-fix-dropins.patch
# Feature plugin definitions lock onto version of plugin at build-time.
# If plugin is external, updating it breaks the feature. (version changes)
# Workaround : Change <plugin> definition to a 'requirement'
-# Also makes the following BSN changes at the same time:
-# com.sun.el -> com.sun.el.javax.el
-# javax.el -> javax.el-api
-# javax.servlet -> javax.servlet-api
-# org.apache.jasper.glassfish -> org.glassfish.web.javax.servlet.jsp
-# org.w3c.dom.smil -> removed
Patch13: eclipse-feature-plugins-to-category-ius.patch
Patch14: eclipse-support-symlink-bundles.patch
@@ -398,9 +394,6 @@ rm -rf
rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
# Optional (unused) multipart support (see patch 25)
rm
rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/multipart/MultipartSupport{Impl,FactoryImpl,Part}.java
-# No strict bin includes
-sed -i -e
'/jgit.dirtyWorkingTree>/a<strictSrcIncludes>false</strictSrcIncludes><strictBinIncludes>false</strictBinIncludes>'
eclipse-platform-parent/pom.xml
-
# Remove jgit deps because building from source tarball, not a git repo
%pom_remove_dep :tycho-buildtimestamp-jgit eclipse-platform-parent
%pom_remove_dep :tycho-sourceref-jgit eclipse-platform-parent
@@ -444,16 +437,18 @@ sed -i -e
'/jgit.dirtyWorkingTree>/a<strictSrcIncludes>false</strictSrcIncludes>
%pom_xpath_remove "plugin[(a)version='1.1.500.qualifier']"
eclipse.jdt/org.eclipse.jdt-feature/feature.xml
# javax.annotation -> jakarta.annotation-api
-sed -i -e 's/javax.annotation/%{_jakarta_annotations}/'
eclipse-platform-parent/pom.xml \
- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml \
- 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 \
+# javax.el -> jakarta.el-api
+# javax.servlet.jsp -> jakarta.servlet.jsp-api
+sed -i -e 's/javax.annotation/%{_jakarta_annotations}/' -e
's/javax.servlet\([^.]\)/%{_jakarta_servlet_api}\1/' \
+ -e 's/javax.el/%{_jakarta_el_api}/' -e
's/com.sun.el/%{_jakarta_el}/' \
+ -e 's/javax.servlet.jsp/%{_jakarta_jsp_api}/' -e
's/org.apache.jasper.glassfish/%{_jakarta_jsp}/' \
+ eclipse-platform-parent/pom.xml \
eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml \
- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
+ eclipse.platform.common/bundles/org.eclipse.*/pom.xml \
+ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt \
+ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml \
+ rt.equinox.bundles/features/org.eclipse.equinox.server.{jetty,simple}/feature.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
@@ -570,6 +565,9 @@ for f in eclipse.jdt/org.eclipse.jdt-feature/feature.xml \
done
done
+# Fix javadoc generation relying on Windows version of SWT
+sed -i -e '/swt/s/swt.win32.win32.x86_64/swt.gtk.linux.%{eclipse_arch}/'
eclipse.platform.common/bundles/org.eclipse*/*Options.txt
+
%if %{with bootstrap} || %{without contrib_tools}
# Disable contributor tools that have external dependencies during bootstrap
%pom_disable_module eclipse.platform.ui.tools
@@ -885,10 +883,14 @@ echo "%{version}-%{release}" >
%{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
%{_eclipsedir}/features/org.eclipse.rcp_*
%{_eclipsedir}/plugins/com.ibm.icu_*
%{_eclipsedir}/plugins/com.jcraft.jsch_*
-%{_eclipsedir}/plugins/com.sun.el.javax.el_*
%{_eclipsedir}/plugins/javax.*
%if 0%{?fedora} >= 33
%{_eclipsedir}/plugins/jakarta.*
+%{_eclipsedir}/plugins/org.glassfish.jakarta.el_*
+%{_eclipsedir}/plugins/org.glassfish.web.jakarta.servlet.jsp_*
+%else
+%{_eclipsedir}/plugins/com.sun.el.javax.el_*
+%{_eclipsedir}/plugins/org.glassfish.web.javax.servlet.jsp_*
%endif
%{_eclipsedir}/plugins/org.apache.*
%{_eclipsedir}/plugins/org.eclipse.ant.core_*
@@ -1031,7 +1033,6 @@ echo "%{version}-%{release}" >
%{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
%{_eclipsedir}/plugins/org.eclipse.ui.workbench.texteditor_*
%{_eclipsedir}/plugins/org.eclipse.update.configurator_*
%{_eclipsedir}/plugins/org.eclipse.urischeme_*
-%{_eclipsedir}/plugins/org.glassfish.web.javax.servlet.jsp_*
%{_eclipsedir}/plugins/org.sat4j.core_*
%{_eclipsedir}/plugins/org.sat4j.pb_*
%{_eclipsedir}/plugins/org.tukaani.xz_*
@@ -1062,6 +1063,10 @@ echo "%{version}-%{release}" >
%{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
%{_eclipsedir}/plugins/org.eclipse.osgi.util_*
%changelog
+* Mon Aug 24 2020 Mat Booth <mat.booth(a)redhat.com> - 1:4.16-12
+- Rebuild against new jakarta-el,-jsp packages
+- Fix javadoc generation relying on Windows version of SWT
+
* Fri Aug 21 2020 Mat Booth <mat.booth(a)redhat.com> - 1:4.16-11
- Rebuild with a dependency on obsolete log4j package
- Run mvn_install with Java 11
diff --git a/sources b/sources
index 2a9ba70..c3c126e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512
(org.eclipse.linuxtools.eclipse-build-d041687bcf34d6c11f4ad2cf43aab5ad5a4c02a1.tar.xz) =
6dbf351457c08c0b3865e4efdd79ff9aaa404d4b2aeeb531a750a9e59c54ba70f8765c8679b04bf1cb43d047b7214dad6de878a2bac54d33614abdda9f730ad8
+SHA512
(org.eclipse.linuxtools.eclipse-build-2f6d1ff5950edd8c0b55bbcc93491bce269e4272.tar.xz) =
39821ad15f0e6058ee0af4bfd791ed3e3bf415aad2c40458ce14848c91d6d795257084e033d33d25b4cee32df8c94ef705c5df9f102a4bb81e913723b5ea9fe5
SHA512 (eclipse-platform-sources-4.16.tar.xz) =
e97d56f4ff7accca82993ebb8edf6cd012f20273f063c764134753dafb38972497521f2a3150c2650655c17149e135eccf781b536d50b382cd1e2fb41ec4a692