From 4985ea26346aefbfea68520a97df9c0613c3a407 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Mon, 15 Jan 2024 21:22:50 +0700
Subject: [PATCH] Replace pki-servlet-engine with tomcat

Resolves: https://issues.redhat.com/browse/RHEL-12764
---
 .gitignore     |  1 +
 sources        |  2 +-
 tomcatjss.spec | 29 +++++++++++++++--------------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0eb2e22..ea467a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 SOURCES/tomcatjss-7.7.1.tar.gz
 /tomcatjss-7.7.1.tar.gz
+/tomcatjss-7.7.3.tar.gz
diff --git a/sources b/sources
index e9cc4c0..94753a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tomcatjss-7.7.1.tar.gz) = dbec1d1090fe4640e967ae7631255a64e9c268a06b89bd1c07de0437b86c6be4749d3823d2f22bb4737ff361e79bc1611baa91dc92671c9cdf13d529288c0e62
+SHA512 (tomcatjss-7.7.3.tar.gz) = 7aa9a1e05f904efdec2e49613f444ca83a3323b9639316e38b374b17737707c458f72f4386fb8cb543b57a920a93fb782b264a379c2757bacf5d42db8d4cd56f
diff --git a/tomcatjss.spec b/tomcatjss.spec
index d6f89a5..0cb5c21 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -2,16 +2,22 @@
 Name:             tomcatjss
 ################################################################################
 
+# Upstream version number:
+%global           major_version 7
+%global           minor_version 7
+%global           update_version 3
+
 Summary:          JSS Connector for Apache Tomcat
 URL:              http://www.dogtagpki.org/wiki/TomcatJSS
-License:          LGPLv2+
+License:          LGPLv2+ and Apache-2.0
 BuildArch:        noarch
 
 # 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.1
-Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
-#global           _phase -alpha1
+%global           release_number 1
+Version:          %{major_version}.%{minor_version}.%{update_version}
+Release:          %{release_number}%{?_timestamp}%{?_commit_id}%{?dist}
+#global           _phase
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/tomcatjss.git
@@ -66,11 +72,7 @@ BuildRequires:    slf4j-jdk14
 BuildRequires:    jss >= 4.9.0, jss < 5.0.0
 
 # Tomcat
-%if 0%{?rhel} && ! 0%{?eln}
-BuildRequires:    pki-servlet-engine >= 1:9.0.7
-%else
-BuildRequires:    tomcat >= 1:9.0.7
-%endif
+BuildRequires:    tomcat >= 1:9.0.83
 
 ################################################################################
 # Runtime Dependencies
@@ -89,11 +91,7 @@ Requires:         slf4j-jdk14
 Requires:         jss >= 4.9.0, jss < 5.0.0
 
 # Tomcat
-%if 0%{?rhel} && ! 0%{?eln}
-Requires:         pki-servlet-engine >= 1:9.0.7
-%else
-Requires:         tomcat >= 1:9.0.7
-%endif
+Requires:         tomcat >= 1:9.0.83
 
 # PKI
 Conflicts:        pki-base < 10.10.0
@@ -145,6 +143,9 @@ ant -f build.xml \
 
 ################################################################################
 %changelog
+* Mon Jan 15 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.3-1
+- Replace pki-servlet-engine with tomcat
+
 * Mon Nov 15 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.1-1
 - Rebase to TomcatJSS 7.7.1