diff --git a/.gitignore b/.gitignore index 5e5fb31..56a4db3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ SOURCES/jss-4.9.4.tar.gz /jss-4.9.4.tar.gz +/jss-4.9.8.tar.gz diff --git a/jss.spec b/jss.spec index afb7716..c517774 100644 --- a/jss.spec +++ b/jss.spec @@ -4,7 +4,7 @@ Name: jss %global major_version 4 %global minor_version 9 -%global update_version 4 +%global update_version 8 Summary: Java Security Services (JSS) URL: http://www.dogtagpki.org/wiki/JSS @@ -12,8 +12,9 @@ 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. +%global release_number 1 Version: %{major_version}.%{minor_version}.%{update_version} -Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +Release: %{release_number}%{?_timestamp}%{?_commit_id}%{?dist} #global _phase -alpha1 # To generate the source tarball: @@ -25,6 +26,10 @@ Release: 1%{?_timestamp}%{?_commit_id}%{?dist} # tarball. Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phase}/%{name}-%{version}%{?_phase}.tar.gz +# md2man not available on i686 +ExcludeArch: i686 + + # To create a patch for all changes since a version tag: # $ git format-patch \ # --stdout \ @@ -84,8 +89,6 @@ Requires: glassfish-jaxb-api Requires: slf4j-jdk14 Requires: apache-commons-lang3 -Provides: jss = %{major_version}.%{minor_version} - Conflicts: ldapjdk < 4.20 Conflicts: idm-console-framework < 1.2 Conflicts: tomcatjss < 7.6.0 @@ -183,6 +186,9 @@ cd %{_vpath_builddir} ################################################################################ %changelog +* Fri Jan 12 2024 Red Hat PKI Team 4.9.8-1 +- Rebase to JSS 4.9.8 + * Wed Jun 01 2022 Red Hat PKI Team 4.9.4-1 - Rebase to JSS 4.9.4 - Bug 2013674 - JSS cannot be properly initialized after using another NSS-backed security provider diff --git a/sources b/sources index 0006ab4..b15195c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-4.9.4.tar.gz) = 64ee1776e83c0ab70a492397d61853f690d65f14786798f810dd1ba8d096282102096ddad4b7c6317440d4a8f50e853d4db2604697165b3e0350ab642f186a5c +SHA512 (jss-4.9.8.tar.gz) = 61a5f3535e1d9f330da4dc7b35d0de81a90a857fdac6547c9887d540427362f322973cc06bdbe89037d12af610979cbb2b6bb6c1d25c948ffb42d3ef72fcf906