From 3b064dfce43b7afe285c8ab9cf37337799453ce5 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Fri, 15 Jun 2018 15:26:44 +0200
Subject: [PATCH] Rebased to TomcatJSS 7.3.1

---
 .gitignore     |  1 +
 sources        |  2 +-
 tomcatjss.spec | 87 ++++++++++++++++++++++++++++++++++----------------
 3 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index 79df268..79dea9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ tomcatjss-1.2.0.tar.gz
 /tomcatjss-7.2.3.tar.gz
 /tomcatjss-7.2.4.tar.gz
 /tomcatjss-7.3.0.tar.gz
+/tomcatjss-7.3.1.tar.gz
diff --git a/sources b/sources
index b977321..95c82af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tomcatjss-7.3.0.tar.gz) = 68d9e36acb9ead97cfdb173126a66b300024d46516b874ea6c692d049c228661349bc5a55c56463a6bb3434f96829c9d88d84e1920e4ed6178ba369097445661
+SHA512 (tomcatjss-7.3.1.tar.gz) = c1c001632e9b5765ddaeca6e3bf0149b1ddf9a5fffaf70acb26094e88ee8a358d5ee28ea39f7274a1c440d11cb8fd204cad9190cdd530572a0755b940e76aedc
diff --git a/tomcatjss.spec b/tomcatjss.spec
index 2f8b4b8..f6e9a25 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -7,22 +7,37 @@ URL:              http://www.dogtagpki.org/wiki/TomcatJSS
 License:          LGPLv2+
 BuildArch:        noarch
 
-Version:          7.3.0
-Release:          2%{?dist}
+Version:          7.3.1
+Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
 
+# To generate the source tarball:
+# $ git clone https://github.com/dogtagpki/tomcatjss.git
+# $ cd tomcatjss
+# $ git archive \
+#     --format=tar.gz \
+#     --prefix tomcatjss-VERSION/ \
+#     -o tomcatjss-VERSION.tar.gz \
+#     <version tag>
 Source:           https://github.com/dogtagpki/tomcatjss/archive/v%{version}/tomcatjss-%{version}.tar.gz
 
+# To create a patch for all changes since a version tag:
+# $ git format-patch \
+#     --stdout \
+#     <version tag> \
+#     > tomcatjss-VERSION-RELEASE.patch
+# Patch: tomcatjss-VERSION-RELEASE.patch
+
 ################################################################################
 # Tomcat
 ################################################################################
 
-%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
-%global app_server tomcat-8.5
+%if 0%{?rhel} && 0%{?rhel} <= 7
+%global app_server tomcat-7.0
 %else
-%if 0%{?fedora}
+%if 0%{?fedora} && 0%{?fedora} <= 27
 %global app_server tomcat-8.0
 %else
-%global app_server tomcat-7.0
+%global app_server tomcat-8.5
 %endif
 %endif
 
@@ -34,30 +49,39 @@ Source:           https://github.com/dogtagpki/tomcatjss/archive/v%{version}/tom
 # jss requires versioning to meet both build and runtime requirements
 # tomcat requires versioning to meet both build and runtime requirements
 
+# autosetup
+BuildRequires:    git
+
 # Java
 BuildRequires:    ant
 BuildRequires:    apache-commons-lang
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils >= 0:1.7.5-15
 
+# SLF4J
+BuildRequires:    slf4j
+%if 0%{?fedora} || 0%{?rhel} > 7
+BuildRequires:    slf4j-jdk14
+%endif
+
 # JSS
-%if 0%{?fedora}
-BuildRequires:    jss >= 4.4.2-2
-%else
+%if 0%{?rhel} && 0%{?rhel} <= 7
 BuildRequires:    jss >= 4.4.0-7
+%else
+BuildRequires:    jss >= 4.4.4-1
 %endif
 
 # Tomcat
-%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
-BuildRequires:    tomcat >= 1:9.0.7
+%if 0%{?rhel} && 0%{?rhel} <= 7
+BuildRequires:    tomcat >= 7.0.69
 %else
-%if 0%{?fedora} >= 28
-BuildRequires:    tomcat >= 1:8.5.23
-%else
-%if 0%{?fedora}
+%if 0%{?fedora} && 0%{?fedora} <= 27
 BuildRequires:    tomcat >= 8.0.49
 %else
-BuildRequires:    tomcat >= 7.0.69
+%if 0%{?fedora} && 0%{?fedora} <= 28
+BuildRequires:    tomcat >= 1:8.5.23
+%else
+BuildRequires:    tomcat >= 1:9.0.7
 %endif
 %endif
 %endif
@@ -75,25 +99,31 @@ Requires:         java
 %endif
 Requires:         jpackage-utils >= 0:1.7.5-15
 
+# SLF4J
+Requires:         slf4j
+%if 0%{?fedora} || 0%{?rhel} > 7
+Requires:         slf4j-jdk14
+%endif
+
 # JSS
-%if 0%{?fedora}
-Requires:         jss >= 4.4.2-2
-%else
+%if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:         jss >= 4.4.0-7
+%else
+Requires:         jss >= 4.4.4-1
 %endif
 
 #Tomcat
-%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
-Requires:         tomcat >= 1:9.0.7
+%if 0%{?rhel} && 0%{?rhel} <= 7
+Requires:         tomcat >= 7.0.69
 %else
-%if 0%{?fedora} >= 28
-Requires:         tomcat >= 1:8.5.23
-%else
-%if 0%{?fedora}
+%if 0%{?fedora} && 0%{?fedora} <= 27
 Requires:         tomcat >= 8.0.49
 Conflicts:        tomcat >= 1:8.5
 %else
-Requires:         tomcat >= 7.0.69
+%if 0%{?fedora} && 0%{?fedora} <= 28
+Requires:         tomcat >= 1:8.5.23
+%else
+Requires:         tomcat >= 1:9.0.7
 %endif
 %endif
 %endif
@@ -125,7 +155,7 @@ NOTE:  The 'tomcatjss' package conflicts with the 'tomcat-native' package
 %prep
 ################################################################################
 
-%autosetup -n tomcatjss-%{version} -p 1
+%autosetup -n tomcatjss-%{version} -p 1 -S git
 
 ################################################################################
 %install
@@ -151,8 +181,9 @@ ant -f build.xml \
 ################################################################################
 %changelog
 
-* Sat May 12 2018 Dogtag PKI Team <pki-devel@redhat.com> 7.3.0-2
+* Fri Jun 15 2018 Dogtag PKI Team <pki-devel@redhat.com> 7.3.1-1
 - Fixed Tomcat dependencies
+- Rebased to TomcatJSS 7.3.1
 
 * Thu Apr 12 2018 Dogtag PKI Team <pki-devel@redhat.com> 7.3.0-1
 - Cleaned up spec file