From b5bc3f78aeb1f30f23943e13695b1cb637826a40 Mon Sep 17 00:00:00 2001
From: Endi S. Dewata <edewata@redhat.com>
Date: May 12 2018 23:50:39 +0000
Subject: Updated Tomcat dependency


---

diff --git a/pki-core.spec b/pki-core.spec
index 24c57ad..d4d9273 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -8,10 +8,10 @@ License:          GPLv2
 
 %if 0%{?rhel}
 Version:          10.6.1
-Release:          2%{?_timestamp}%{?_commit_id}%{?dist}
+Release:          3%{?_timestamp}%{?_commit_id}%{?dist}
 %else
 Version:          10.6.1
-Release:          2%{?_timestamp}%{?_commit_id}%{?dist}
+Release:          3%{?_timestamp}%{?_commit_id}%{?dist}
 %endif
 
 # To create a tarball from a version tag:
@@ -30,6 +30,16 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}/pki-%{version}.tar.
 Patch: pki-10.6.1-2.patch
 
 ################################################################################
+# NSS
+################################################################################
+
+%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
+%global nss_default_db_type sql
+%else
+%global nss_default_db_type dbm
+%endif
+
+################################################################################
 # Python
 ################################################################################
 
@@ -64,7 +74,7 @@ Patch: pki-10.6.1-2.patch
 # Tomcat
 ################################################################################
 
-%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
+%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
 %global app_server tomcat-8.5
 %else
 %if 0%{?fedora}
@@ -230,7 +240,7 @@ BuildRequires:    systemd-units
 %if 0%{?fedora} >= 29 || 0%{?rhel} > 7
 BuildRequires:    tomcat >= 1:9.0.7
 %else
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 28
 BuildRequires:    tomcat >= 1:8.5.23
 %else
 %if 0%{?fedora}
@@ -571,11 +581,12 @@ Obsoletes:        pki-selinux < %{version}-%{release}
 %if 0%{?fedora} >= 29 || 0%{?rhel} > 7
 Requires:         tomcat >= 1:9.0.7
 %else
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 28
 Requires:         tomcat >= 1:8.5.23
 %else
 %if 0%{?fedora}
 Requires:         tomcat >= 8.0.49
+Conflicts:        tomcat >= 1:8.5
 %else
 Requires:         tomcat >= 7.0.69
 %endif
@@ -823,28 +834,16 @@ cd build
     -DAPP_SERVER=%{app_server} \
     -DJAXRS_API_JAR=%{jaxrs_api_jar} \
     -DRESTEASY_LIB=%{resteasy_lib} \
+    -DPKI_NSS_DB_TYPE=%{nss_default_db_type} \
     -DBUILD_PKI_CORE:BOOL=ON \
-%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
-    -DPKI_NSS_DB_TYPE=sql \
-%endif
-%if ! %{?with_python3}
-    -DWITH_PYTHON3:BOOL=OFF \
-%endif
-%if ! %{?with_python2}
-    -DWITH_PYTHON2:BOOL=OFF \
-%endif
+    -DWITH_PYTHON2:BOOL=%{?with_python2:ON}%{!?with_python2:OFF} \
+    -DWITH_PYTHON3:BOOL=%{?with_python3:ON}%{!?with_python3:OFF} \
 %if %{?with_python3_default}
     -DWITH_PYTHON3_DEFAULT:BOOL=ON \
 %endif
-%if ! %{with test}
-    -DWITH_TEST:BOOL=OFF \
-%endif
-%if ! %{with server}
-    -DWITH_SERVER:BOOL=OFF \
-%endif
-%if ! %{with javadoc}
-    -DWITH_JAVADOC:BOOL=OFF \
-%endif
+    -DWITH_TEST:BOOL=%{?with_test:ON}%{!?with_test:OFF} \
+    -DWITH_SERVER:BOOL=%{?with_server:ON}%{!?with_server:OFF} \
+    -DWITH_JAVADOC:BOOL=%{?with_javadoc:ON}%{!?with_javadoc:OFF} \
     ..
 
 ################################################################################
@@ -1375,6 +1374,9 @@ fi
 ################################################################################
 %changelog
 
+* Sat May 12 2018 Dogtag PKI Team <pki-devel@redhat.com> - 10.6.1-3
+- Updated Tomcat dependency
+
 * Fri May 4 2018 Dogtag PKI Team <pki-devel@redhat.com> - 10.6.1-2
 - Bugzilla #1574711: pki-tools cannot be installed on current Rawhide
 - Fixed rpmlint warnings