From 359da8b8ddf7d74f8f9964c7de4289f579749462 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 8 Jun 2021 20:17:56 +0200
Subject: [PATCH] Bootstrap Maven as non-modular packages

Resolves: rhbz#1951482
---
 jakarta-servlet.spec | 51 ++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/jakarta-servlet.spec b/jakarta-servlet.spec
index 41df723..44bc2c9 100644
--- a/jakarta-servlet.spec
+++ b/jakarta-servlet.spec
@@ -1,45 +1,40 @@
-%global srcname servlet-api
+# Workaround for rhbz#1969370: __bootstrap macro is not defined in
+# CentOS Stream, See https://bugzilla.redhat.com/1969370
+%global __bootstrap ~bootstrap
+
+%bcond_without bootstrap
 
 Name:           jakarta-servlet
 Version:        5.0.0
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        Server-side API for handling HTTP requests and responses
 # most of the project is EPL-2.0 or GPLv2 w/exceptions,
 # but some files still have Apache-2.0 license headers:
 # https://github.com/eclipse-ee4j/servlet-api/issues/347
 License:        (EPL-2.0 or GPLv2 with exceptions) and ASL 2.0
-
 URL:            https://github.com/eclipse-ee4j/servlet-api
-Source0:        %{url}/archive/%{version}-RELEASE/%{srcname}-%{version}.tar.gz
-
 BuildArch:      noarch
 
+Source0:        https://github.com/eclipse-ee4j/servlet-api/archive/%{version}-RELEASE/servlet-api-%{version}.tar.gz
+
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+%endif
 
-# package renamed in fedora 33, remove in fedora 35
 Provides:       glassfish-servlet-api = %{version}-%{release}
-Obsoletes:      glassfish-servlet-api < 3.1.0-21
 
 %description
 Jakarta Servlet defines a server-side API for handling HTTP requests
 and responses.
 
-
-%package javadoc
-Summary:        Javadoc for %{name}
-
-# package renamed in fedora 33, remove in fedora 35
-Provides:       glassfish-servlet-api-javadoc = %{version}-%{release}
-Obsoletes:      glassfish-servlet-api-javadoc < 3.1.0-21
-
-%description javadoc
-This package contains the API documentation for %{name}.
-
+%{?javadoc_package}
 
 %prep
-%setup -q -n %{srcname}-%{version}-RELEASE
+%setup -q -n servlet-api-%{version}-RELEASE
 
 # remove unnecessary dependency on parent POM
 %pom_remove_parent . api
@@ -72,26 +67,26 @@ sed -i -e 's/jakarta\./javax./g' $(find api/src/main/java/javax -name *.java)
 # add compat symlink for packages constructing the classpath manually
 %mvn_file :{*} %{name}/@1 glassfish-servlet-api
 
-
 %build
 %mvn_build
 
-
 %install
 %mvn_install
 
-
 %files -f .mfiles
 %license LICENSE.md NOTICE.md
 %doc README.md
 
-%files javadoc -f .mfiles-javadoc
-%license LICENSE.md NOTICE.md
-
-
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.0.0-6
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.0.0-8
+- Bootstrap Maven for CentOS Stream 9
+
+* Wed May 26 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.0.0-7
+- Re-add provides on glassfish-servlet-api
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.0.0-6
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild