Rebase to JSS 5.6.0-alpha1
Resolves: RHEL-34871
This commit is contained in:
Marco Fargetta
parent
34f75f9f6e
commit
96ab540f22
1
.gitignore
vendored
1
.gitignore
vendored
@ -50,3 +50,4 @@ jss-4.2.6.tar.gz
|
||||
/jss-5.4.1.tar.gz
|
||||
/jss-5.5.0-alpha3.tar.gz
|
||||
/jss-5.5.0.tar.gz
|
||||
/jss-5.6.0-alpha1.tar.gz
|
||||
|
||||
56
jss.spec
56
jss.spec
@ -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 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
|
||||
@ -55,10 +56,22 @@ ExcludeArch: i686
|
||||
# Java
|
||||
################################################################################
|
||||
|
||||
%if 0%{?fedora} && 0%{?fedora} <= 39 || 0%{?rhel} && 0%{?rhel} <= 9
|
||||
|
||||
# use Java 17 on Fedora 39 or older and RHEL 9 or older
|
||||
%define java_devel java-17-openjdk-devel
|
||||
%define java_headless java-17-openjdk-headless
|
||||
%define java_home %{_jvmdir}/jre-17-openjdk
|
||||
|
||||
%else
|
||||
|
||||
# otherwise, use Java 21
|
||||
%define java_devel java-21-openjdk-devel
|
||||
%define java_headless java-21-openjdk-headless
|
||||
%define java_home %{_jvmdir}/jre-21-openjdk
|
||||
|
||||
%endif
|
||||
|
||||
################################################################################
|
||||
# Build Options
|
||||
################################################################################
|
||||
@ -68,10 +81,10 @@ ExcludeArch: i686
|
||||
|
||||
%bcond_without javadoc
|
||||
|
||||
# By default the build will not execute unit tests unless --with tests
|
||||
# option is specified.
|
||||
# By default the tests package will be built and the tests will executed
|
||||
# unless --without tests option is specified.
|
||||
|
||||
%bcond_with tests
|
||||
%bcond_without tests
|
||||
|
||||
################################################################################
|
||||
# Build Dependencies
|
||||
@ -91,7 +104,6 @@ BuildRequires: maven-local
|
||||
BuildRequires: mvn(org.apache.commons:commons-lang3)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-jdk14)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
|
||||
%description
|
||||
Java Security Services (JSS) is a java native interface which provides a bridge
|
||||
@ -160,6 +172,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 +362,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 +388,9 @@ cp base/target/jss-tests.jar %{buildroot}%{_datadir}/jss/tests/lib
|
||||
|
||||
################################################################################
|
||||
%changelog
|
||||
* Wed Dec 04 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.6.0-alpha1
|
||||
- Rebase to JSS 5.6.0-alpha1
|
||||
|
||||
* Wed Feb 21 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.5.0-1
|
||||
- Rebase to JSS 5.5.0
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (jss-5.5.0.tar.gz) = bda0b4df1ef08a264525c9124a29f57945e3a24adadda609b54032d840a1c311d522e34f29bb2246d03d493d108d425a64e4826edcc8a296a2f55b1cdd8a95c0
|
||||
SHA512 (jss-5.6.0-alpha1.tar.gz) = 239952d7b1fc9d005760e9234aec84a84a02becefffa525853e9cccd5cfc88e6e0d9d2ea2eea59f43e3b6d1686878081eae1e615ed68d759b3c5aef7397a5472
|
||||
|
||||
Loading…
Reference in New Issue
Block a user