Rebase to JSS 5.0.0-alpha2

This commit is contained in:
Endi S. Dewata 2021-08-12 13:03:54 -05:00
parent 8e5f461e83
commit f29b811b7f
3 changed files with 24 additions and 11 deletions

1
.gitignore vendored
View File

@ -35,3 +35,4 @@ jss-4.2.6.tar.gz
/jss-4.8.1.tar.gz /jss-4.8.1.tar.gz
/jss-4.9.0-alpha1.tar.gz /jss-4.9.0-alpha1.tar.gz
/jss-5.0.0-alpha1.tar.gz /jss-5.0.0-alpha1.tar.gz
/jss-5.0.0-alpha2.tar.gz

View File

@ -9,8 +9,8 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+
# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>. # 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. # For official (i.e. supported) releases, use x.y.z-r where r >=1.
Version: 5.0.0 Version: 5.0.0
Release: 0.2.alpha1%{?_timestamp}%{?_commit_id}%{?dist} Release: 0.3.alpha2%{?_timestamp}%{?_commit_id}%{?dist}
%global _phase -alpha1 %global _phase -alpha2
# To generate the source tarball: # To generate the source tarball:
# $ git clone https://github.com/dogtagpki/jss.git # $ git clone https://github.com/dogtagpki/jss.git
@ -40,10 +40,15 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
# Build Options # Build Options
################################################################################ ################################################################################
# By default the build will not execute unit tests unless --with test # By default the javadoc package will be built unless --without javadoc
# option is specified. # option is specified.
%bcond_with test %bcond_without javadoc
# By default the build will execute unit tests unless --without test
# option is specified.
%bcond_without test
################################################################################ ################################################################################
# Build Dependencies # Build Dependencies
@ -55,9 +60,8 @@ BuildRequires: zip
BuildRequires: unzip BuildRequires: unzip
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: nspr-devel >= 4.13.1 BuildRequires: nss-devel >= 3.66
BuildRequires: nss-devel >= 3.44 BuildRequires: nss-tools >= 3.66
BuildRequires: nss-tools >= 3.44
BuildRequires: %{java_devel} BuildRequires: %{java_devel}
BuildRequires: jpackage-utils BuildRequires: jpackage-utils
BuildRequires: slf4j BuildRequires: slf4j
@ -67,7 +71,7 @@ BuildRequires: apache-commons-lang3
BuildRequires: junit BuildRequires: junit
Requires: nss >= 3.44 Requires: nss >= 3.66
Requires: %{java_headless} Requires: %{java_headless}
Requires: jpackage-utils Requires: jpackage-utils
Requires: slf4j Requires: slf4j
@ -85,6 +89,7 @@ Java Security Services (JSS) is a java native interface which provides a bridge
for java-based applications to use native Network Security Services (NSS). for java-based applications to use native Network Security Services (NSS).
This only works with gcj. Other JREs require that JCE providers be signed. This only works with gcj. Other JREs require that JCE providers be signed.
%if %{with javadoc}
################################################################################ ################################################################################
%package javadoc %package javadoc
################################################################################ ################################################################################
@ -94,6 +99,7 @@ Requires: jss = %{version}-%{release}
%description javadoc %description javadoc
This package contains the API documentation for JSS. This package contains the API documentation for JSS.
%endif
################################################################################ ################################################################################
%prep %prep
@ -123,6 +129,7 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA
--java-lib-dir=%{_jnidir} \ --java-lib-dir=%{_jnidir} \
--jss-lib-dir=%{_libdir}/jss \ --jss-lib-dir=%{_libdir}/jss \
--version=%{version} \ --version=%{version} \
%{!?with_javadoc:--without-javadoc} \
%{!?with_test:--without-test} \ %{!?with_test:--without-test} \
dist dist
@ -144,16 +151,21 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA
%{_libdir}/* %{_libdir}/*
%{_jnidir}/* %{_jnidir}/*
%if %{with javadoc}
################################################################################ ################################################################################
%files javadoc %files javadoc
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}/ %{_javadocdir}/%{name}/
%endif
################################################################################ ################################################################################
%changelog %changelog
* Thu Aug 12 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.0.0-0.3.alpha2
- Rebase to JSS 5.0.0-alpha2
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.0-0.2.alpha1 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.0-0.2.alpha1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jun 22 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.0.0-0.1 * Tue Jun 22 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.0.0-0.1.alpha1
- Rebase to JSS 5.0.0-alpha1 - Rebase to JSS 5.0.0-alpha1

View File

@ -1 +1 @@
SHA512 (jss-5.0.0-alpha1.tar.gz) = 27c18c88cea85a62e9dd2b1c4bf7223629938fd1a47d5c0c9168eaa3ab79366961dd9c6a17cd2c37633b18b9287776ecb2b027090425d530cddb4d056b220e39 SHA512 (jss-5.0.0-alpha2.tar.gz) = de48ce48f2bc6544871308394ccaa187c4aecb72b3f4d5ce5dd692e8a6f6edaa835ce12aa80c2ac0745baca05e7fb7b943ae3abafe88636c07868633111c6118