Rebased to PKI 10.7.3

Signed-off-by: Dinesh Prasanth M K <dmoluguw@redhat.com>
This commit is contained in:
Dinesh Prasanth M K 2019-08-09 10:59:30 -04:00
parent 6490d71d65
commit c3c0a7cfee
No known key found for this signature in database
GPG Key ID: 0D4491AB07D86AB0
3 changed files with 20 additions and 12 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/pki-10.6.8.tar.gz
/pki-10.6.9.tar.gz
/pki-10.7.0.tar.gz
/pki-10.7.3.tar.gz

View File

@ -7,8 +7,8 @@ URL: http://www.dogtagpki.org/
# The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
License: GPLv2 and LGPLv2
Version: 10.7.0
Release: 2%{?_timestamp}%{?_commit_id}%{?dist}
Version: 10.7.3
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
# To create a tarball from a version tag:
@ -181,7 +181,7 @@ BuildRequires: gcc-c++
BuildRequires: zip
BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: redhat-rpm-config
BuildRequires: ldapjdk >= 4.20
BuildRequires: ldapjdk >= 4.21.0
BuildRequires: apache-commons-cli
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-io
@ -288,8 +288,8 @@ BuildRequires: jpackage-utils >= 0:1.7.5-10
BuildRequires: jss >= 4.4.0-11
BuildRequires: tomcatjss >= 7.2.1-4
%else
BuildRequires: jss >= 4.5.3
BuildRequires: tomcatjss >= 7.4.0
BuildRequires: jss >= 4.6.0
BuildRequires: tomcatjss >= 7.4.1
%endif
BuildRequires: systemd-units
@ -311,7 +311,11 @@ BuildRequires: zlib
BuildRequires: zlib-devel
# build dependency to build man pages
%if 0%{?fedora} && 0%{?fedora} <= 30 || 0%{?rhel}
BuildRequires: go-md2man
%else
BuildRequires: golang-github-cpuguy83-md2man
%endif
# PKICertImport depends on certutil and openssl
BuildRequires: nss-tools
@ -407,7 +411,7 @@ Requires: jpackage-utils >= 0:1.7.5-10
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: jss >= 4.4.0-11
%else
Requires: jss >= 4.5.3
Requires: jss >= 4.6.0
%endif
Requires: nss >= 3.38.0
@ -529,9 +533,9 @@ Requires: jpackage-utils >= 0:1.7.5-10
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: jss >= 4.4.0-11
%else
Requires: jss >= 4.5.3
Requires: jss >= 4.6.0
%endif
Requires: ldapjdk >= 4.20
Requires: ldapjdk >= 4.21.0
Requires: pki-base = %{version}
%if 0%{?rhel} && 0%{?rhel} <= 7
@ -658,7 +662,7 @@ Requires(pre): shadow-utils
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: tomcatjss >= 7.2.1-4
%else
Requires: tomcatjss >= 7.4.0
Requires: tomcatjss >= 7.4.1
%endif
# https://pagure.io/freeipa/issue/7742
@ -1167,8 +1171,8 @@ fi
## from EITHER 'sysVinit' OR previous 'systemd' processes to the new
## PKI deployment process
echo "Upgrading PKI server configuration at `/bin/date`." >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
/sbin/pki-server-upgrade --silent >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
echo "Upgrading PKI server configuration on `/bin/date`." >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
/sbin/pki-server upgrade --silent >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1
# Reload systemd daemons on upgrade only
@ -1538,6 +1542,9 @@ fi
################################################################################
%changelog
* Thu Aug 08 2019 Dogtag PKI Team <pki-devel@redhat.com> - 10.7.3-1
- Rebased to PKI 10.7.3
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 10.7.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (pki-10.7.0.tar.gz) = 7f6a2abf9ba72da1048349da8dedc7d2897dd7fe70d5dee31b13f63e8cecf9f865ecfb56570b7c2e5827e9ea1a180cf9321a8e4a33895b753915e1c8caaeb2f8
SHA512 (pki-10.7.3.tar.gz) = 72df85af4b8a0e2b13e7789441d9a195f331fcdf154f1eed10bd27d83385d387cc40f2d85927157b3bcfcd666a690d6e0513b9aea09fc14068db1c83835de50b