[rpms/jss] pqc: Rebase to JSS 5.8.0-beta4

[rpms/jss] pqc: Rebase to JSS 5.8.0-beta4

[jmagne]

A new commit has been pushed.

Repo   : rpms/jss
Branch : pqc
Commit : 591b9b8293c8071fe86c09529a53e88c209978a9
Author : jmagne <jmagne@redhat.com>
Date   : 2025-08-11T16:01:16-07:00
Stats  : +22/-19 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/jss/c/591b9b8293c8071fe86c09529a53e88c209978a9?branch=pqc

Log:
Rebase to JSS 5.8.0-beta4

---
diff --git a/.gitignore b/.gitignore
index 129463a..0bac5df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@ jss-4.2.6.tar.gz
 /jss-5.6.0-alpha1.tar.gz
 /jss-5.8.0-beta1.tar.gz
 /jss-5.8.0-beta3.tar.gz
+/jss-5.8.0-beta4.tar.gz

diff --git a/jss.spec b/jss.spec
index 033f464..d31e1f5 100644
--- a/jss.spec
+++ b/jss.spec
@@ -13,13 +13,17 @@ Name:           jss
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
 # - GA/update (supported): <n> where n >= 1
-%global         release_number 0.3
+%global         release_number 0.4
 
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
 # - stabilization (unsupported): beta<n> where n >= 1
 # - GA/update (supported): <none>
-%global         phase beta3
+%global         phase beta4
+
+%if 0%{?rhel} && 0%{?rhel} >= 10
+%global enable_nss_version_pqc_def_flag -DENABLE_NSS_VERSION_PQC_DEF=ON
+%endif
 
 %undefine       timestamp
 %undefine       commit_id
@@ -28,7 +32,7 @@ Summary:        Java Security Services (JSS)
 URL:            https://github.com/dogtagpki/jss
 License:        (MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later) AND Apache-2.0
 Version:        %{major_version}.%{minor_version}.%{update_version}
-Release:        %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.3
+Release:        %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.1
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/jss.git
@@ -61,12 +65,12 @@ ExcludeArch: i686
 
 # maven-local is a subpackage of javapackages-tools
 
-%if 0%{?fedora} && 0%{?fedora} <= 39 || 0%{?rhel} && 0%{?rhel} <= 9
+%if 0%{?fedora} && 0%{?fedora} >= 43
 
-%define java_devel java-17-openjdk-devel
-%define java_headless java-17-openjdk-headless
-%define java_home %{_jvmdir}/jre-17-openjdk
-%define maven_local maven-local-openjdk17
+%define java_devel java-25-openjdk-devel
+%define java_headless java-25-openjdk-headless
+%define java_home %{_jvmdir}/jre-25-openjdk
+%define maven_local maven-local-openjdk25
 
 %else
 
@@ -149,14 +153,14 @@ This only works with gcj. Other JREs require that JCE providers be signed.
 Summary:        Java Security Services (JSS) Connector for Tomcat
 
 # Tomcat
-BuildRequires:  mvn(org.apache.tomcat:tomcat-catalina) >= 10.1.43
-BuildRequires:  mvn(org.apache.tomcat:tomcat-coyote) >= 10.1.43
-BuildRequires:  mvn(org.apache.tomcat:tomcat-juli) >= 10.1.43
+BuildRequires:  mvn(org.apache.tomcat:tomcat-catalina) >= 10.1.36
+BuildRequires:  mvn(org.apache.tomcat:tomcat-coyote) >= 10.1.36
+BuildRequires:  mvn(org.apache.tomcat:tomcat-juli) >= 10.1.36
 
 Requires:       %{product_id} = %{version}-%{release}
-Requires:       mvn(org.apache.tomcat:tomcat-catalina) >= 10.1.43
-Requires:       mvn(org.apache.tomcat:tomcat-coyote) >= 10.1.43
-Requires:       mvn(org.apache.tomcat:tomcat-juli) >= 10.1.43
+Requires:       mvn(org.apache.tomcat:tomcat-catalina) >= 10.1.36
+Requires:       mvn(org.apache.tomcat:tomcat-coyote) >= 10.1.36 
+Requires:       mvn(org.apache.tomcat:tomcat-juli) >= 10.1.36
 
 # Tomcat JSS has been replaced with JSS Connector for Tomcat.
 # This will remove installed Tomcat JSS packages.
@@ -393,11 +397,8 @@ cp base/target/jss-tests.jar %{buildroot}%{_datadir}/jss/tests/lib
 
 ################################################################################
 %changelog
-* Wed Jul 30 2025 jiri vanek <jvanek@redhat.com> - 5.8.0-0.3.beta3.3
-- Rrevert to jdk21
-
-* Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 5.8.0-0.3.beta3.2
-- Rebuilt for java-25-openjdk as preffered jdk
+* Mon Aug 11 2025 Dogtag PKI Team <devel@lists.dogtagpki.org> 5.8.0.4
+- Rebase to JSS 5.8.0-beta4
 
 * Mon Jul 28 2025 Dogtag PKI Team <devel@lists.dogtagpki.org> 5.8.0.3
 - Rebase to JSS 5.8.0-beta3

diff --git a/sources b/sources
index 94e6cfe..fc75bdf 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (jss-5.6.0-alpha1.tar.gz) = 239952d7b1fc9d005760e9234aec84a84a02becefffa525853e9cccd5cfc88e6e0d9d2ea2eea59f43e3b6d1686878081eae1e615ed68d759b3c5aef7397a5472
 SHA512 (jss-5.8.0-beta1.tar.gz) = 7890b416218260d215ae80082a05a6c59b3671603ed64afd3ed1e20da20577c34674f53622a075073c568003f3f8dcb05b7b447bd1e32d39292e5e613cbfe894
 SHA512 (jss-5.8.0-beta3.tar.gz) = 6647ff938d69e39d2ad5f9bb00e03f7fee25c37ba6e4d13700266bdc6c82770927e87ebe486b6bc3378c3368b25db70481ad9d63fd1dd6c9a76e7affd8a127e6
+SHA512 (jss-5.8.0-beta4.tar.gz) = cec7515c4496926303c3b1835d301174588298c8ef1c1cb2bc8fd95683833765d88de5b77af44e418fa953643d2a2d38cc2bd8888abadfc1bd1553e2b33c6268