diff --git a/.gitignore b/.gitignore index d584a8a..f8083a5 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ jss-4.2.6.tar.gz /jss-5.0.0-beta1.tar.gz /jss-5.0.0.tar.gz /jss-5.1.0-alpha2.tar.gz +/jss-5.1.0.tar.gz diff --git a/jss.spec b/jss.spec index 7b8165e..9d0dd7f 100644 --- a/jss.spec +++ b/jss.spec @@ -9,8 +9,8 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ # For development (i.e. unsupported) releases, use x.y.z-0.n.. # For official (i.e. supported) releases, use x.y.z-r where r >=1. Version: 5.1.0 -Release: 0.3.alpha2%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -alpha2 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +#global _phase -alpha2 # To generate the source tarball: # $ git clone https://github.com/dogtagpki/jss.git @@ -124,8 +124,8 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA ./build.sh \ %{?_verbose:-v} \ --work-dir=%{_vpath_builddir} \ - --java-lib-dir=%{_jnidir} \ - --jss-lib-dir=%{_libdir}/jss \ + --jni-dir=%{_jnidir} \ + --lib-dir=%{_libdir} \ --version=%{version} \ %{!?with_javadoc:--without-javadoc} \ %{?with_tests:--with-tests} \ @@ -145,7 +145,7 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA %defattr(-,root,root,-) %doc jss.html -%license MPL-1.1.txt gpl.txt lgpl.txt +%license MPL-1.1.txt gpl.txt lgpl.txt symkey/LICENSE %{_libdir}/* %{_jnidir}/* @@ -159,6 +159,9 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA ################################################################################ %changelog +* Mon Feb 14 2022 Dogtag PKI Team - 5.1.0-1 +- Rebase to JSS 5.1.0 + * Sat Feb 05 2022 Jiri Vanek - 5.1.0-0.3.alpha2 - Rebuilt for java-17-openjdk as system jdk diff --git a/sources b/sources index 1205a51..eefcf57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-5.1.0-alpha2.tar.gz) = 6c97b42d4d52e6b016b0da72f834f8307905d894780f00a329e39cf3c1271cfb56873f899bd3090188aba015315b08d8b2d8848f5e4f053c64cd1e012f10a6f5 +SHA512 (jss-5.1.0.tar.gz) = 5bed03b443a2f9c8912e153a27469bdd6e8363465c3748c39defb19de1db1f489293ff86aeb6be7417e1b4bdc2c7915847b35521c220c68e18b2c15c24144306