Rebase to JSS 5.6.0-alpha1

Resolves: RHEL-70106
This commit is contained in:
Marco Fargetta 2024-12-05 12:31:05 +01:00
parent 0c699fe3fe
commit a96a8ef605
3 changed files with 37 additions and 7 deletions

1
.gitignore vendored
View File

@ -55,3 +55,4 @@ jss-4.2.6.tar.gz
/jss-5.4.2.tar.gz
/jss-5.5.0-alpha2.tar.gz
/jss-5.5.0.tar.gz
/jss-5.6.0-alpha1.tar.gz

View File

@ -2,23 +2,24 @@
Name: jss
################################################################################
%global product_id idm-jss
%global vendor_id idm
%global product_id %{vendor_id}-jss
# Upstream version number:
%global major_version 5
%global minor_version 5
%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 3
%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
@ -27,7 +28,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}.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
@ -71,7 +72,7 @@ ExcludeArch: i686
# By default the build will not execute unit tests unless --with tests
# option is specified.
%bcond_with tests
%bcond_without tests
################################################################################
# Build Dependencies
@ -160,6 +161,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
@ -333,6 +351,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
@ -351,6 +377,9 @@ cp base/target/jss-tests.jar %{buildroot}%{_datadir}/jss/tests/lib
################################################################################
%changelog
* Thu Dec 05 2024 Troy Dawson <tdawson@redhat.com> - 5.6.0-alpha1
- Rebase to JSS 5.6.0-alpha1
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 5.5.0-3.1
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018

View File

@ -1 +1 @@
SHA512 (jss-5.5.0.tar.gz) = bda0b4df1ef08a264525c9124a29f57945e3a24adadda609b54032d840a1c311d522e34f29bb2246d03d493d108d425a64e4826edcc8a296a2f55b1cdd8a95c0
SHA512 (jss-5.6.0-alpha1.tar.gz) = 239952d7b1fc9d005760e9234aec84a84a02becefffa525853e9cccd5cfc88e6e0d9d2ea2eea59f43e3b6d1686878081eae1e615ed68d759b3c5aef7397a5472