From 7cb2ffa835a1753b09cb3f9e1475f0e3647bcd97 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Aug 26 2020 12:33:54 +0000
Subject: Rebuild against new jakarta-jsp packages


---

diff --git a/eclipse-cdt-config-ini.patch b/eclipse-cdt-config-ini.patch
index ef94c7a..64060ff 100644
--- a/eclipse-cdt-config-ini.patch
+++ b/eclipse-cdt-config-ini.patch
@@ -10,15 +10,6 @@ index 71ffdc66..952042b3 100644
        <plugin id="org.apache.batik.constants"/>
        <plugin id="org.apache.batik.css"/>
        <plugin id="org.apache.batik.i18n"/>
-@@ -195,7 +194,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
-       <plugin id="org.apache.felix.scr"/>
-       <plugin id="org.apache.httpcomponents.httpclient"/>
-       <plugin id="org.apache.httpcomponents.httpcore"/>
--      <plugin id="org.apache.jasper.glassfish"/>
-+      <plugin id="org.glassfish.web.javax.servlet.jsp"/>
-       <plugin id="org.apache.lucene.analyzers-common"/>
-       <plugin id="org.apache.lucene.analyzers-smartcn"/>
-       <plugin id="org.apache.lucene.core"/>
 @@ -203,10 +202,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
        <plugin id="org.eclipse.cdt.core"/>
        <plugin id="org.eclipse.cdt.core.linux" fragment="true"/>
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index c396009..e1bc268 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -40,18 +40,22 @@ Epoch: 2
 %global _jakarta_el jakarta.el-api
 %global _jakarta_servlet jakarta.servlet-api
 %global _jakarta_jaxb jakarta.xml.bind-api
+%global _jakarta_jsp_api javax.servlet.jsp-api
+%global _jakarta_jsp org.glassfish.web.jakarta.servlet.jsp
 %else
 %global _jakarta_activation jakarta.activation-api
 %global _jakarta_annotations javax.annotation-api
 %global _jakarta_el javax.el-api
 %global _jakarta_servlet javax.servlet-api
 %global _jakarta_jaxb jaxb-api
+%global _jakarta_jsp_api javax.servlet.jsp
+%global _jakarta_jsp org.glassfish.web.javax.servlet.jsp
 %endif
 
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        9.11.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:        EPL-2.0 and CPL
 URL:            https://www.eclipse.org/cdt
 
@@ -389,6 +393,7 @@ sed -i -e 's/org.freemarker/org.freemarker.freemarker/' \
 # Fix deps javax -> jakarta
 sed -i -e 's/>javax.annotation</>%{_jakarta_annotations}</' -e 's/"javax.annotation"/"%{_jakarta_annotations}"/' \
        -e 's/"javax.activation"/"%{_jakarta_activation}"/' -e 's/"javax.el"/"%{_jakarta_el}"/' -e 's/"javax.servlet"/"%{_jakarta_servlet}"/' \
+       -e 's/"javax.servlet.jsp"/"%{_jakarta_jsp_api}"/' -e 's/"org.apache.jasper.glassfish"/"%{_jakarta_jsp}"/' \
   doc/org.eclipse.cdt.doc.isv/pom.xml \
   debug/org.eclipse.cdt.debug.application.product/debug.product
 
@@ -531,6 +536,9 @@ install -D -m 644 man/cdtdebug.man %{buildroot}/%{_mandir}/man1/cdtdebug.1
 %endif
 
 %changelog
+* Wed Aug 26 2020 Mat Booth <mat.booth@redhat.com> - 2:9.11.1-10
+- Rebuild against new jakarta-jsp packages
+
 * Mon Aug 24 2020 Mat Booth <mat.booth@redhat.com> - 2:9.11.1-9
 - Fix build against new jakarta packages