From 0e65f98d7f87007236ab9b6eadaa90cfa2974c51 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 9 Nov 2021 05:01:12 -0500
Subject: [PATCH] import tomcatjss-7.7.0-1.module+el8.5.0+11983+6ba118b4

---
 .gitignore           |  2 +-
 .tomcatjss.metadata  |  2 +-
 SPECS/tomcatjss.spec | 54 ++++++++++++++++++++++++++------------------
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 343c4d4..3eab4fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/tomcatjss-7.6.1.tar.gz
+SOURCES/tomcatjss-7.7.0.tar.gz
diff --git a/.tomcatjss.metadata b/.tomcatjss.metadata
index ab0952c..d29f765 100644
--- a/.tomcatjss.metadata
+++ b/.tomcatjss.metadata
@@ -1 +1 @@
-5bd1aecee0fb11d59b064c305a373d97f8574ace SOURCES/tomcatjss-7.6.1.tar.gz
+abde08950f904b45086e8069386acb8f77b4b923 SOURCES/tomcatjss-7.7.0.tar.gz
diff --git a/SPECS/tomcatjss.spec b/SPECS/tomcatjss.spec
index eb6ac81..94cb300 100644
--- a/SPECS/tomcatjss.spec
+++ b/SPECS/tomcatjss.spec
@@ -7,9 +7,11 @@ URL:              http://www.dogtagpki.org/wiki/TomcatJSS
 License:          LGPLv2+
 BuildArch:        noarch
 
-Version:          7.6.1
+# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
+# For official (i.e. supported) releases, use x.y.z-r where r >=1.
+Version:          7.7.0
 Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
-#global           _phase -a1
+#global           _phase -alpha1
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/tomcatjss.git
@@ -28,6 +30,20 @@ Source:           https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_
 #     > tomcatjss-VERSION-RELEASE.patch
 # Patch: tomcatjss-VERSION-RELEASE.patch
 
+################################################################################
+# Java
+################################################################################
+
+%if 0%{?fedora} && 0%{?fedora} <= 32 || 0%{?rhel} && 0%{?rhel} <= 8
+%define java_devel java-1.8.0-openjdk-devel
+%define java_headless java-1.8.0-openjdk-headless
+%define java_home /usr/lib/jvm/jre-1.8.0-openjdk
+%else
+%define java_devel java-11-openjdk-devel
+%define java_headless java-11-openjdk-headless
+%define java_home /usr/lib/jvm/jre-11-openjdk
+%endif
+
 ################################################################################
 # Build Dependencies
 ################################################################################
@@ -36,13 +52,10 @@ Source:           https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_
 # jss requires versioning to meet both build and runtime requirements
 # tomcat requires versioning to meet both build and runtime requirements
 
-# autosetup
-BuildRequires:    git
-
 # Java
 BuildRequires:    ant
 BuildRequires:    apache-commons-lang3
-BuildRequires:    java-devel
+BuildRequires:    %{java_devel}
 BuildRequires:    jpackage-utils >= 0:1.7.5-15
 
 # SLF4J
@@ -50,10 +63,10 @@ BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
 
 # JSS
-BuildRequires:    jss >= 4.8.0
+BuildRequires:    jss >= 4.9.0, jss < 5.0.0
 
 # Tomcat
-%if 0%{?rhel}
+%if 0%{?rhel} && ! 0%{?eln}
 BuildRequires:    pki-servlet-engine >= 1:9.0.7
 %else
 BuildRequires:    tomcat >= 1:9.0.7
@@ -65,11 +78,7 @@ BuildRequires:    tomcat >= 1:9.0.7
 
 # Java
 Requires:         apache-commons-lang3
-%if 0%{?fedora} >= 21
-Requires:         java-headless
-%else
-Requires:         java
-%endif
+Requires:         %{java_headless}
 Requires:         jpackage-utils >= 0:1.7.5-15
 
 # SLF4J
@@ -77,10 +86,10 @@ Requires:         slf4j
 Requires:         slf4j-jdk14
 
 # JSS
-Requires:         jss >= 4.8.0
+Requires:         jss >= 4.9.0, jss < 5.0.0
 
 # Tomcat
-%if 0%{?rhel}
+%if 0%{?rhel} && ! 0%{?eln}
 Requires:         pki-servlet-engine >= 1:9.0.7
 %else
 Requires:         tomcat >= 1:9.0.7
@@ -105,7 +114,7 @@ Services (NSS).
 %prep
 ################################################################################
 
-%autosetup -n tomcatjss-%{version}%{?_phase} -p 1 -S git
+%autosetup -n tomcatjss-%{version}%{?_phase} -p 1
 
 ################################################################################
 %install
@@ -113,12 +122,7 @@ Services (NSS).
 
 # get Tomcat <major>.<minor> version number
 tomcat_version=`/usr/sbin/tomcat version | sed -n 's/Server number: *\([0-9]\+\.[0-9]\+\).*/\1/p'`
-
-if [ $tomcat_version == "9.0" ]; then
-    app_server=tomcat-8.5
-else
-    app_server=tomcat-$tomcat_version
-fi
+app_server=tomcat-$tomcat_version
 
 ant -f build.xml \
     -Dversion=%{version} \
@@ -141,6 +145,12 @@ ant -f build.xml \
 
 ################################################################################
 %changelog
+* Mon Jul 26 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.0-1
+- Rebase to TomcatJSS 7.7.0
+
+* Fri Jun 11 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.0-0.1
+- Rebase to TomcatJSS 7.7.0-alpha1
+
 * Tue Nov 17 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 7.6.1-1
 - Rebase to TomcatJSS 7.6.1