diff --git a/.gitignore b/.gitignore index e30ba5e..143c491 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ jss-4.2.6.tar.gz /jss-5.2.0-beta2.tar.gz /jss-5.2.0.tar.gz /jss-5.2.1.tar.gz +/jss-5.3.0-beta1.tar.gz diff --git a/jss.spec b/jss.spec index bb75faa..21a1e03 100644 --- a/jss.spec +++ b/jss.spec @@ -6,19 +6,19 @@ Name: jss # Upstream version number: %global major_version 5 -%global minor_version 2 -%global update_version 1 +%global minor_version 3 +%global update_version 0 # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 # - GA/update (supported): where n >= 1 -%global release_number 1 +%global release_number 0.2 # Development phase: # - development (unsupported): alpha where n >= 1 # - stabilization (unsupported): beta where n >= 1 # - GA/update (supported): -%undefine phase +%global phase beta1 %undefine timestamp %undefine commit_id @@ -45,8 +45,11 @@ Source: https://github.com/dogtagpki/jss/archive/v%{version}%{?phase:-}% # > jss-VERSION-RELEASE.patch # Patch: jss-VERSION-RELEASE.patch -# Java 17 and md2man are not available on i686 +%if 0%{?fedora} && 0%{?fedora} > 35 +ExclusiveArch: %{java_arches} +%else ExcludeArch: i686 +%endif ################################################################################ # Java @@ -110,6 +113,8 @@ Requires: apache-commons-lang3 Obsoletes: jss < %{version}-%{release} Provides: jss = %{version}-%{release} +Provides: jss = %{major_version}.%{minor_version} +Provides: %{product_id} = %{major_version}.%{minor_version} Conflicts: ldapjdk < 4.20 Conflicts: idm-console-framework < 1.2 @@ -130,6 +135,8 @@ Summary: Java Security Services (JSS) Javadocs Obsoletes: jss-javadoc < %{version}-%{release} Provides: jss-javadoc = %{version}-%{release} +Provides: jss-javadoc = %{major_version}.%{minor_version} +Provides: %{product_id}-javadoc = %{major_version}.%{minor_version} %description -n %{product_id}-javadoc This package contains the API documentation for JSS. @@ -208,6 +215,9 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA ################################################################################ %changelog +* Wed Nov 30 2022 Red Hat PKI Team - 5.3.0-0.2.beta1 +- Rebase to JSS 5.3.0-beta1 + * Fri Sep 02 2022 Red Hat PKI Team - 5.2.1-1 - Rebase to JSS 5.2.1 - Bug 2100807 - pki-tomcat/kra unable to decrypt when using RSA-OAEP padding in RHEL9 with FIPS enabled diff --git a/sources b/sources index bc5f6df..fd9eda6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-5.2.1.tar.gz) = 7742cc9bc13ccdc8f53966e3aaf8d379395299d6c3ac5f0b64e6b75b89ea8beadd8be543a368644ca432012de87de5528c5cc7c48a7808a6a0b3c9fdb024086f +SHA512 (jss-5.3.0-beta1.tar.gz) = 91af0ce14617826af88a63be80a9e507d04a018c1483e7a0acf662b8c853e9205cc8d9b3c934b05ea9471e66f549305911411b8f80efb15d58b0b1aace3fb994