From 71ef5485388cf33487e6cf9c53e6dd25b3ecde96 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Sat, 6 Jan 2018 17:57:23 +0100
Subject: [PATCH] Rebased to TomcatJSS 7.3.0

---
 .gitignore     |  1 +
 sources        |  2 +-
 tomcatjss.spec | 33 +++++++++++++++++++++++----------
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index d8a0467..79df268 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ tomcatjss-1.2.0.tar.gz
 /tomcatjss-7.2.2.tar.gz
 /tomcatjss-7.2.3.tar.gz
 /tomcatjss-7.2.4.tar.gz
+/tomcatjss-7.3.0.tar.gz
diff --git a/sources b/sources
index 4e35c77..cf30588 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tomcatjss-7.2.4.tar.gz) = bba19c8bd2132b910eeb3b34233677ce7a0a42a3561377cad0d67005c5c8c7036c91987f4163de955546d5f735e5d88dd068e1b0426e9313c26bd37ab5c9797a
+SHA512 (tomcatjss-7.3.0.tar.gz) = 0bc0381857e48fc432ac1780333fc2755b9579c370d418354c708f8dbac3a8d2a3a3d46795fef7a36b7c2b8d9024649c1c58d090be70ddae61f73f5adf1e4968
diff --git a/tomcatjss.spec b/tomcatjss.spec
index e9a7cbe..2a7aea3 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -1,6 +1,6 @@
 Name:     tomcatjss
-Version:  7.2.4
-Release:  3%{?dist}
+Version:  7.3.0
+Release:  0.2%{?dist}
 Summary:  JSS Connector for Apache Tomcat, a JSSE module for Apache Tomcat that uses JSS
 URL:      http://pki.fedoraproject.org/
 License:  LGPLv2+
@@ -23,10 +23,17 @@ BuildRequires:    jss >= 4.4.2-2
 %else
 BuildRequires:    jss >= 4.4.0-7
 %endif
-%if 0%{?fedora} >= 23
-BuildRequires:    tomcat >= 8.0.18
+%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
+BuildRequires:     tomcat >= 8.5.23
+%global app_server tomcat-8.5
 %else
-BuildRequires:    tomcat >= 7.0.68
+%if 0%{?fedora}
+BuildRequires:     tomcat >= 8.0.49
+%global app_server tomcat-8.0
+%else
+BuildRequires:     tomcat >= 7.0.68
+%global app_server tomcat-7.0
+%endif
 %endif
 
 Requires:         apache-commons-lang
@@ -41,11 +48,16 @@ Requires:         jss >= 4.4.2-2
 %else
 Requires:         jss >= 4.4.0-7
 %endif
-%if 0%{?fedora} >= 23
-Requires:         tomcat >= 8.0.18
+
+%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
+Requires:         tomcat >= 8.5.23
+%else
+%if 0%{?fedora}
+Requires:         tomcat >= 8.0.49
 %else
 Requires:         tomcat >= 7.0.68
 %endif
+%endif
 
 # The 'tomcatjss' package conflicts with the 'tomcat-native' package
 # because it uses an underlying NSS security model rather than the
@@ -75,11 +87,9 @@ chmod -c -x LICENSE README
 
 %build
 
-ant -f build.xml -Djnidir=%{_jnidir}
-ant -f build.xml -Djnidir=%{_jnidir} dist
+ant -f build.xml -Dversion=%{version} -Dsrc.dir=%{app_server} -Djnidir=%{_jnidir} dist
 
 %install
-rm -rf %{buildroot}
 
 # Unpack the files we just built
 cd dist/binary
@@ -98,6 +108,9 @@ ln -s %{name}-%{version}.jar %{name}.jar
 %{_javadir}/*
 
 %changelog
+* Thu Mar 15 2018 Dogtag PKI Team <pki-devel@redhat.com> 7.3.0-0.2
+- Rebased to TomcatJSS 7.3.0
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild