Rebase to JSS 5.1.0-alpha2

This commit is contained in:
Chris Kelley 2021-11-26 15:11:57 +00:00
parent 23bd244360
commit fa24161b1a
3 changed files with 14 additions and 10 deletions

1
.gitignore vendored
View File

@ -38,3 +38,4 @@ jss-4.2.6.tar.gz
/jss-5.0.0-alpha2.tar.gz
/jss-5.0.0-beta1.tar.gz
/jss-5.0.0.tar.gz
/jss-5.1.0-alpha2.tar.gz

View File

@ -8,9 +8,9 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+
# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
# For official (i.e. supported) releases, use x.y.z-r where r >=1.
Version: 5.0.0
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
#global _phase -alpha1
Version: 5.1.0
Release: 0.1.alpha2%{?_timestamp}%{?_commit_id}%{?dist}
%global _phase -alpha2
# To generate the source tarball:
# $ git clone https://github.com/dogtagpki/jss.git
@ -32,9 +32,9 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
# Java
################################################################################
%define java_devel java-11-openjdk-devel
%define java_headless java-11-openjdk-headless
%define java_home /usr/lib/jvm/jre-11-openjdk
%define java_devel java-17-openjdk-devel
%define java_headless java-17-openjdk-headless
%define java_home %{_jvmdir}/jre-17-openjdk
################################################################################
# Build Options
@ -45,10 +45,10 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
%bcond_without javadoc
# By default the build will execute unit tests unless --without test
# By default the build will not execute unit tests unless --with tests
# option is specified.
%bcond_without test
%bcond_with tests
################################################################################
# Build Dependencies
@ -128,7 +128,7 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA
--jss-lib-dir=%{_libdir}/jss \
--version=%{version} \
%{!?with_javadoc:--without-javadoc} \
%{!?with_test:--without-test} \
%{?with_tests:--with-tests} \
dist
################################################################################
@ -159,6 +159,9 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA
################################################################################
%changelog
* Fri Nov 26 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.1.0-0.1.alpha2
- Rebase to JSS 5.1.0-alpha2
* Thu Sep 30 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.0.0-1
- Rebase to JSS 5.0.0

View File

@ -1 +1 @@
SHA512 (jss-5.0.0.tar.gz) = 9857ff8e6c1e54927c78904be2d9a84ad4afc0559e95a4c835fd2000388c542d90d31bca7da7e99b0b74ef6e4175512227acb3341aa3475526f5f222c071aa97
SHA512 (jss-5.1.0-alpha2.tar.gz) = 6c97b42d4d52e6b016b0da72f834f8307905d894780f00a329e39cf3c1271cfb56873f899bd3090188aba015315b08d8b2d8848f5e4f053c64cd1e012f10a6f5