From 590afb162f2e6a2b705c0474bc2d8e27c0020730 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Aug 14 2020 09:06:48 +0000
Subject: Rebuild for new jetty version


---

diff --git a/eclipse.spec b/eclipse.spec
index fefe295..5778275 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -12,7 +12,7 @@ Epoch:                  1
 %global eclipse_rel     %{version}
 %global eclipse_tag     R-%{eclipse_rel}-202006040540
 
-%global _jetty_version  9.4.30
+%global _jetty_version  9.4.31
 %global _lucene_version 8.4.1
 %global _batik_version 1.11
 
@@ -40,7 +40,7 @@ Epoch:                  1
 %endif
 
 # Glassfish EE APIs that moved to jakarta namespace
-%if 0%{?fedora}
+%if 0%{?fedora} >= 33
 %global _jakarta_annotations jakarta.annotation-api
 %else
 %global _jakarta_annotations javax.annotation-api
@@ -49,7 +49,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.16
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        EPL-2.0
 URL:            http://www.eclipse.org/
 
@@ -202,7 +202,6 @@ BuildRequires: atinject
 BuildRequires: eclipse-ecf-core >= 3.14.8
 BuildRequires: eclipse-emf-core >= 1:2.22.0
 BuildRequires: eclipse-license2
-BuildRequires: glassfish-annotation-api
 BuildRequires: glassfish-el-api >= 3.0.1
 BuildRequires: glassfish-el >= 3.0.1
 BuildRequires: glassfish-jsp-api >= 2.2.1-4
@@ -279,7 +278,6 @@ Requires: xml-commons-apis
 Requires: atinject
 Requires: eclipse-ecf-core >= 3.14.8
 Requires: eclipse-emf-core >= 1:2.22.0
-Requires: glassfish-annotation-api
 Requires: glassfish-el-api >= 3.0.1
 Requires: glassfish-el >= 3.0.1
 Requires: glassfish-jsp-api >= 2.2.1-4
@@ -890,7 +888,7 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_eclipsedir}/plugins/com.jcraft.jsch_*
 %{_eclipsedir}/plugins/com.sun.el.javax.el_*
 %{_eclipsedir}/plugins/javax.*
-%if 0%{?fedora}
+%if 0%{?fedora} >= 33
 %{_eclipsedir}/plugins/jakarta.*
 %endif
 %{_eclipsedir}/plugins/org.apache.*
@@ -1065,6 +1063,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Fri Aug 14 2020 Mat Booth <mat.booth@redhat.com> - 1:4.16-8
+- Rebuild for new jetty version
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.16-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild