From a3eac308e0212d5c71b09027d3c35797caa1c64a Mon Sep 17 00:00:00 2001
From: Marco Fargetta <mfargett@redhat.com>
Date: Sat, 15 Feb 2025 12:58:54 +0100
Subject: [PATCH] Rebase to JSS 5.6.0

Resolves: RHEL-70106
---
 .gitignore |  1 +
 jss.spec   | 19 ++++++++++++-------
 sources    |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index b86e355..d01b3cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,4 @@ jss-4.2.6.tar.gz
 /jss-5.5.0-alpha2.tar.gz
 /jss-5.5.0.tar.gz
 /jss-5.6.0-alpha1.tar.gz
+/jss-5.6.0.tar.gz
diff --git a/jss.spec b/jss.spec
index 21dded5..7a82555 100644
--- a/jss.spec
+++ b/jss.spec
@@ -13,13 +13,13 @@ Name:           jss
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
 # - GA/update (supported): <n> where n >= 1
-%global         release_number 0.1
+%global         release_number 1
 
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
 # - stabilization (unsupported): beta<n> where n >= 1
 # - GA/update (supported): <none>
-%global         phase alpha1
+#global         phase
 
 %undefine       timestamp
 %undefine       commit_id
@@ -84,8 +84,8 @@ BuildRequires:  zip
 BuildRequires:  unzip
 
 BuildRequires:  gcc-c++
-BuildRequires:  nss-devel >= 3.66
-BuildRequires:  nss-tools >= 3.66
+BuildRequires:  nss-devel >= 3.97
+BuildRequires:  nss-tools >= 3.97
 
 BuildRequires:  %{java_devel}
 BuildRequires:  maven-local
@@ -105,7 +105,7 @@ This only works with gcj. Other JREs require that JCE providers be signed.
 
 Summary:        Java Security Services (JSS)
 
-Requires:       nss >= 3.66
+Requires:       nss >= 3.97
 
 Requires:       %{java_headless}
 Requires:       mvn(org.apache.commons:commons-lang3)
@@ -136,18 +136,20 @@ 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
+BuildRequires:  tomcat9-lib
 
 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
+Requires:       tomcat9 >= 1:9.0.62
 
 # Tomcat JSS has been replaced with JSS Connector for Tomcat.
 # This will remove installed Tomcat JSS packages.
 Obsoletes:      tomcatjss <= 8.5
 Conflicts:      tomcatjss <= 8.5
-Obsoletes:      idm-tomcatjss <= 8.5
-Conflicts:      idm-tomcatjss <= 8.5
+Obsoletes:      %{vendor_id}-tomcatjss <= 8.5
+Conflicts:      %{vendor_id}-tomcatjss <= 8.5
 
 %if 0%{?rhel} <= 8
 # PKI Servlet Engine has been replaced with Tomcat.
@@ -377,6 +379,9 @@ cp base/target/jss-tests.jar %{buildroot}%{_datadir}/jss/tests/lib
 
 ################################################################################
 %changelog
+* Sat Feb 15 2025 Red Hat PKI Team <rhcs-maint@redhat.com>- 5.6.0-1
+- Rebase to JSS 5.6.0
+
 * Thu Dec 05 2024 Troy Dawson <tdawson@redhat.com> - 5.6.0-alpha1
 - Rebase to JSS 5.6.0-alpha1
 
diff --git a/sources b/sources
index 8d8bc4b..90b7f7a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jss-5.6.0-alpha1.tar.gz) = 239952d7b1fc9d005760e9234aec84a84a02becefffa525853e9cccd5cfc88e6e0d9d2ea2eea59f43e3b6d1686878081eae1e615ed68d759b3c5aef7397a5472
+SHA512 (jss-5.6.0.tar.gz) = 6d4aeea6cbf82972e2d5283a2f8d37b767731f668afd1b41333cad70f3e1e760048f0c750654d3de85c878bef6ab9e2258a2ead66c48045a7d5283d4d797cc2a