Updated Tomcat dependencies

The spec templates have been updated to require Tomcat 9.0.7
on Fedora 29.

Change-Id: I20ea698e99675d703360cce96f666b3629f31188

Author: edewata

specs/pki-console.spec.in

@@ -218,7 +218,10 @@ BuildRequires:    tomcatjss >= 7.3.0
 %endif
 BuildRequires:    systemd-units
 
-%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
+%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
+BuildRequires:    tomcat >= 1:9.0.7
+%else
+%if 0%{?fedora} >= 27
 BuildRequires:    tomcat >= 1:8.5.23
 %else
 %if 0%{?fedora}
@@ -227,6 +230,7 @@ BuildRequires:    tomcat >= 8.0.49
 BuildRequires:    tomcat >= 7.0.69
 %endif
 %endif
+%endif
 
 %if 0%{?with_python3}
 BuildRequires:    python3

specs/pki-core.spec.in

@@ -227,7 +227,10 @@ BuildRequires:    tomcatjss >= 7.3.0
 %endif
 BuildRequires:    systemd-units
 
-%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
+%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
+BuildRequires:    tomcat >= 1:9.0.7
+%else
+%if 0%{?fedora} >= 27
 BuildRequires:    tomcat >= 1:8.5.23
 %else
 %if 0%{?fedora}
@@ -236,6 +239,7 @@ BuildRequires:    tomcat >= 8.0.49
 BuildRequires:    tomcat >= 7.0.69
 %endif
 %endif
+%endif
 
 %if 0%{?with_python3}
 BuildRequires:    python3
@@ -562,7 +566,10 @@ Requires:         policycoreutils-python
 Requires:         selinux-policy-targeted >= 3.13.1-159
 Obsoletes:        pki-selinux < %{version}-%{release}
 
-%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
+%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
+Requires:         tomcat >= 1:9.0.7
+%else
+%if 0%{?fedora} >= 27
 Requires:         tomcat >= 1:8.5.23
 %else
 %if 0%{?fedora}
@@ -571,6 +578,7 @@ Requires:         tomcat >= 8.0.49
 Requires:         tomcat >= 7.0.69
 %endif
 %endif
+%endif
 
 Requires:         velocity
 Requires(post):   systemd-units

specs/pki.spec.in

@@ -255,7 +255,10 @@ BuildRequires:    tomcatjss >= 7.3.0
 %endif
 BuildRequires:    systemd-units
 
-%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
+%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
+BuildRequires:    tomcat >= 1:9.0.7
+%else
+%if 0%{?fedora} >= 27
 BuildRequires:    tomcat >= 1:8.5.23
 %else
 %if 0%{?fedora}
@@ -264,6 +267,7 @@ BuildRequires:    tomcat >= 8.0.49
 BuildRequires:    tomcat >= 7.0.69
 %endif
 %endif
+%endif
 
 %if 0%{?with_python3}
 BuildRequires:    python3
@@ -515,9 +519,6 @@ Requires:         java-1.8.0-openjdk-headless
 Requires:         pki-base >= %{version}-%{release}
 Requires:         pki-base-java >= %{version}-%{release}
 Requires:         jpackage-utils >= 0:1.7.5-10
-%if 0%{?fedora} || 0%{?rhel} > 7
-Requires:         tomcat-servlet-3.1-api
-%endif
 
 %description -n   pki-tools
 This package contains PKI executables that can be used to help make
@@ -593,7 +594,10 @@ Requires:         policycoreutils-python
 Requires:         selinux-policy-targeted >= 3.13.1-159
 Obsoletes:        pki-selinux < %{version}-%{release}
 
-%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
+%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
+Requires:         tomcat >= 1:9.0.7
+%else
+%if 0%{?fedora} >= 27
 Requires:         tomcat >= 1:8.5.23
 %else
 %if 0%{?fedora}
@@ -602,6 +606,7 @@ Requires:         tomcat >= 8.0.49
 Requires:         tomcat >= 7.0.69
 %endif
 %endif
+%endif
 
 Requires:         velocity
 Requires(post):   systemd-units