From d57b65a020f67b99116ee18d478333cdfce6ef0c Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Jan 15 2021 12:02:01 +0000 Subject: Rebase to latest upstream stable v10.10.3 Signed-off-by: Alexander Scheel --- diff --git a/.gitignore b/.gitignore index e233775..e1cec43 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,5 @@ /pki-10.9.4.tar.gz /pki-10.10.0-b1.tar.gz /pki-10.10.0.tar.gz +/pki-10.10.2.tar.gz +/pki-10.10.3.tar.gz diff --git a/pki-core.spec b/pki-core.spec index 3bd2e49..9421ebe 100644 --- a/pki-core.spec +++ b/pki-core.spec @@ -12,8 +12,8 @@ License: GPLv2 and 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: 10.10.0 -Release: 2%{?_timestamp}%{?_commit_id}%{?dist} +Version: 10.10.3 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} #global _phase -beta1 # To create a tarball from a version tag: @@ -31,10 +31,6 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver # > pki-VERSION-RELEASE.patch # Patch: pki-VERSION-RELEASE.patch -Patch1: 0001-Add-workaround-for-missing-capture_output-in-Python-.patch -Patch2: 0001-Fix-JSS-initialization-in-pki-server-subsystem-user-.patch -Patch3: 0001-Fix-NPE-in-UGSubsystem.findUsersByKeyword.patch - ################################################################################ # NSS ################################################################################ @@ -1385,6 +1381,9 @@ fi ################################################################################ %changelog +* Thu Jan 14 2021 Dogtag PKI Team - 10.10.3-1 +- Rebase to upstream stable v10.10.2-1 release + * Thu Nov 05 2020 Dogtag PKI Team - 10.10.0-2 - Add missing pki-acme package - Add workaround for missing capture_output in Python 3.6 diff --git a/sources b/sources index 3d408b8..6e8d0db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pki-10.10.0.tar.gz) = aa8870bd6dde004e5739d0975ad2e5e06b29596e751fd4497340d9e7b6abe2dc244f742f4877a077dd2569d08541fae0acc212f37f6c085ddeee39b65215ff3c +SHA512 (pki-10.10.3.tar.gz) = 130c9f0715570e08db73731cbcf01d8adb36589ac09d335801ac4b217a8b2c4c35e09b28e8dd80a0fbf0ea81984f8d7cc47d6fd758832f74efbf3e5f4edf47c1