From 72156606cb396d7e253b63e0da4e517b8caec432 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 03 2021 06:35:20 +0000
Subject: import pki-core-10.10.5-1.module+el8.4.0+10167+ab954dab


---

diff --git a/.gitignore b/.gitignore
index a16c0d3..2e17446 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/pki-10.10.4.tar.gz
+SOURCES/pki-10.10.5.tar.gz
diff --git a/.pki-core.metadata b/.pki-core.metadata
index fb7b485..a910798 100644
--- a/.pki-core.metadata
+++ b/.pki-core.metadata
@@ -1 +1 @@
-d50ec310c6584bd0eb1448b6d40614954827a73d SOURCES/pki-10.10.4.tar.gz
+61641f173fb9de15b4f16bdcef95ca97479bc947 SOURCES/pki-10.10.5.tar.gz
diff --git a/SPECS/pki-core.spec b/SPECS/pki-core.spec
index ecd5d9e..a23ca6b 100644
--- a/SPECS/pki-core.spec
+++ b/SPECS/pki-core.spec
@@ -12,7 +12,7 @@ License:          GPLv2 and LGPLv2
 
 # For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
 # For official (i.e. supported) releases, use x.y.z-r where r >=1.
-Version:          10.10.4
+Version:          10.10.5
 Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
 #global           _phase -beta1
 
@@ -862,14 +862,8 @@ java_version=`%{java_home}/bin/java -XshowSettings:properties -version 2>&1 | se
 # otherwise get <major> version number
 java_version=`echo $java_version | sed -e 's/^1\.//' -e 's/\..*$//'`
 
-# get Tomcat <major>.<minor> version number
-tomcat_version=`/usr/sbin/tomcat version | sed -n 's/Server number: *\([0-9]\+\.[0-9]\+\).*/\1/p'`
-
-if [ $tomcat_version == "9.0" ]; then
-    app_server=tomcat-8.5
-else
-    app_server=tomcat-$tomcat_version
-fi
+# assume tomcat app_server
+app_server=tomcat-8.5
 
 %if 0%{?rhel}
 %{__mkdir_p} build
@@ -1399,6 +1393,10 @@ fi
 
 ################################################################################
 %changelog
+* Tue Feb 23 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 10.10.5-1
+- Rebase to PKI 10.10.5
+- Bug 1929067 - PKI instance creation failed with new 389-ds-base build
+
 * Mon Feb 08 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 10.10.4-1
 - Rebase to PKI 10.10.4
 - Bug 1664435 - Error instantiating class for challenge_password with SCEP request