[rpms/jss] pqc: Rebase to JSS v5.6.0-alpha1

[rpms/jss] pqc: Rebase to JSS v5.6.0-alpha1

[Marco Fargetta]

A new commit has been pushed.

Repo   : rpms/jss
Branch : pqc
Commit : 1f8ce4dbba00f3552912caf3dcfb120da1a5fecf
Author : Marco Fargetta <mfargett@redhat.com>
Date   : 2024-11-20T18:40:21+01:00
Stats  : +39/-8 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/jss/c/1f8ce4dbba00f3552912caf3dcfb120da1a5fecf?branch=pqc

Log:
Rebase to JSS v5.6.0-alpha1

---
diff --git a/.gitignore b/.gitignore
index 411bfea..377c2aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@ jss-4.2.6.tar.gz
 /jss-5.5.0-alpha2.tar.gz
 /jss-5.5.0.tar.gz
 /jss-5.5.1.tar.gz
+/jss-5.6.0-alpha1.tar.gz

diff --git a/jss.spec b/jss.spec
index a8fc6ce..e4a38ca 100644
--- a/jss.spec
+++ b/jss.spec
@@ -2,32 +2,33 @@
 Name:           jss
 ################################################################################
 
-%global         product_id dogtag-jss
+%global         vendor_id dogtag
+%global         product_id %{vendor_id}-jss
 
 # Upstream version number:
 %global         major_version 5
-%global         minor_version 5
-%global         update_version 1
+%global         minor_version 6
+%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 alpha1
 
 %undefine       timestamp
 %undefine       commit_id
 
 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
+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}.1
+Release:        %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/jss.git
@@ -159,6 +160,23 @@ JSS Connector for Tomcat is a Java Secure Socket Extension (JSSE)
 module for Apache Tomcat that uses Java Security Services (JSS),
 a Java interface to Network Security Services (NSS).
 
+################################################################################
+%package -n %{product_id}-tools
+################################################################################
+
+Summary:        Java Security Services (JSS) Tools
+
+Provides:       jss-tools = %{version}-%{release}
+Provides:       jss-tools = %{major_version}.%{minor_version}
+Provides:       %{product_id}-tools = %{major_version}.%{minor_version}
+
+# Some PKI tools have been moved into jss-tools.
+Conflicts:      pki-tools < 11.6
+Conflicts:      %{vendor_id}-pki-tools < 11.6
+
+%description -n %{product_id}-tools
+This package contains JSS tools.
+
 %if %{with javadoc}
 ################################################################################
 %package -n %{product_id}-javadoc
@@ -332,6 +350,14 @@ cp base/target/jss-tests.jar %{buildroot}%{_datadir}/jss/tests/lib
 %files -n %{product_id}-tomcat -f .mfiles-jss-tomcat
 ################################################################################
 
+################################################################################
+%files -n %{product_id}-tools
+################################################################################
+
+%{_bindir}/p12tool
+%{_bindir}/p7tool
+%{_bindir}/sslget
+
 %if %{with javadoc}
 ################################################################################
 %files -n %{product_id}-javadoc -f .mfiles-javadoc
@@ -350,8 +376,12 @@ cp base/target/jss-tests.jar %{buildroot}%{_datadir}/jss/tests/lib
 
 ################################################################################
 %changelog
+* Wed Nov 20 2024 Dogtag PKI Team <devel@lists.dogtagpki.org> 5.6.0-1
+- Rebase to JSS 5.6.0-alpha1
+
 * Fri Oct 04 2024 Dogtag PKI Team <devel@lists.dogtagpki.org> 5.5.1-1
 - Rebase to JSS 5.5.1
+
 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.0-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

diff --git a/sources b/sources
index 353a32d..8d8bc4b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jss-5.5.1.tar.gz) = 182c9b5f8b6c542278ff44e8573be902194a72c0e9621e2bcdb8df8770a165d83ed27d9189c4c8e66b7ed41cdfe7d66124ef6a056ea0be36ef202126cfce8be3
+SHA512 (jss-5.6.0-alpha1.tar.gz) = 239952d7b1fc9d005760e9234aec84a84a02becefffa525853e9cccd5cfc88e6e0d9d2ea2eea59f43e3b6d1686878081eae1e615ed68d759b3c5aef7397a5472