From e14392deb8bab97dff65987eb0cdd4293da6c420 Mon Sep 17 00:00:00 2001
From: Super User <edewata@redhat.com>
Date: Tue, 1 Jul 2025 18:42:23 +0000
Subject: [PATCH] Rebase to JSS 5.7.0-beta1

Resolves: RHEL-99830
---
 .gitignore |  1 +
 jss.spec   | 23 ++++++++++++++++-------
 sources    |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 082bfe0..07225d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@ jss-4.2.6.tar.gz
 /jss-5.5.0.tar.gz
 /jss-5.6.0-alpha1.tar.gz
 /jss-5.6.0.tar.gz
+/jss-5.7.0-beta1.tar.gz
diff --git a/jss.spec b/jss.spec
index b964869..206b657 100644
--- a/jss.spec
+++ b/jss.spec
@@ -8,19 +8,19 @@ Name:           jss
 
 # Upstream version number:
 %global         major_version 5
-%global         minor_version 6
+%global         minor_version 7
 %global         update_version 0
 
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
 # - GA/update (supported): <n> where n >= 1
-%global         release_number 1
+%global         release_number 0.1
 
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
 # - stabilization (unsupported): beta<n> where n >= 1
 # - GA/update (supported): <none>
-#global         phase
+%global         phase beta1
 
 %undefine       timestamp
 %undefine       commit_id
@@ -102,8 +102,8 @@ BuildRequires:  zip
 BuildRequires:  unzip
 
 BuildRequires:  gcc-c++
-BuildRequires:  nss-devel >= 3.97
-BuildRequires:  nss-tools >= 3.97
+BuildRequires:  nss-devel >= 3.101
+BuildRequires:  nss-tools >= 3.101
 
 BuildRequires:  %{java_devel}
 BuildRequires:  %{maven_local}
@@ -122,7 +122,7 @@ This only works with gcj. Other JREs require that JCE providers be signed.
 
 Summary:        Java Security Services (JSS)
 
-Requires:       nss >= 3.97
+Requires:       nss >= 3.101
 
 Requires:       %{java_headless}
 Requires:       mvn(org.apache.commons:commons-lang3)
@@ -153,11 +153,17 @@ Summary:        Java Security Services (JSS) Connector for Tomcat
 BuildRequires:  mvn(org.apache.tomcat:tomcat-catalina) >= 9.0.62
 BuildRequires:  mvn(org.apache.tomcat:tomcat-coyote) >= 9.0.62
 BuildRequires:  mvn(org.apache.tomcat:tomcat-juli) >= 9.0.62
+%if 0%{?rhel} && 0%{?rhel} >= 10
+BuildRequires:  tomcat9-lib
+%endif
 
 Requires:       %{product_id} = %{version}-%{release}
 Requires:       mvn(org.apache.tomcat:tomcat-catalina) >= 9.0.62
 Requires:       mvn(org.apache.tomcat:tomcat-coyote) >= 9.0.62
 Requires:       mvn(org.apache.tomcat:tomcat-juli) >= 9.0.62
+%if 0%{?rhel} && 0%{?rhel} >= 10
+Requires:       tomcat9 >= 1:9.0.62
+%endif
 
 # Tomcat JSS has been replaced with JSS Connector for Tomcat.
 # This will remove installed Tomcat JSS packages.
@@ -394,10 +400,13 @@ cp base/target/jss-tests.jar %{buildroot}%{_datadir}/jss/tests/lib
 
 ################################################################################
 %changelog
+* Tue Jul 01 2025 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.7.0-0.1.beta1
+- Rebase to JSS 5.7.0-beta1
+
 * Thu Feb 13 2025 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.6.0-1
 - Rebase to JSS 5.6.0
 
-* Wed Dec 04 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.6.0-alpha1
+* Wed Dec 04 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.6.0-0.1.alpha1
 - Rebase to JSS 5.6.0-alpha1
 
 * Wed Feb 21 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.5.0-1
diff --git a/sources b/sources
index c6f334a..3ab0149 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jss-5.6.0.tar.gz) = 6fc8ec84a26f06ab7ba3a84bf37e1da33bd72d269714707b0e82f54d85e5450e0dba8fe08ecf92274200f737b08d06634b02f6c32d27b2de46ad514d4faa36ae
+SHA512 (jss-5.7.0-beta1.tar.gz) = 7d8570953801f89c20a8a7556f316470e3f8036ccdf9495882c17082900f83e7c4218d11fa7374da4018184eb80a728f38f80d240edcc5993cc8e169046dfa6d