From e8d17f85ef060222f831c4435f06f35d70588b41 Mon Sep 17 00:00:00 2001
From: Dinesh Prasanth M K <dmoluguw@redhat.com>
Date: Jun 10 2020 19:57:28 +0000
Subject: Rebase to match latest upstream version v7.5.0-a1


Signed-off-by: Dinesh Prasanth M K <dmoluguw@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index c2197d7..389138b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ tomcatjss-1.2.0.tar.gz
 /tomcatjss-7.3.7.tar.gz
 /tomcatjss-7.4.0.tar.gz
 /tomcatjss-7.4.1.tar.gz
+/tomcatjss-7.5.0-a1.tar.gz
diff --git a/sources b/sources
index 435ad8a..4e2ca85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tomcatjss-7.4.1.tar.gz) = 14701755b1019a1ba10e53e18608a79b0f0c11173335758ea2542f83f146a434a133b7879a66ccef30d904c3bcaf25805e2f63b0c9ecb194406aa9e189f0622c
+SHA512 (tomcatjss-7.5.0-a1.tar.gz) = 627fd909cac5c8261d7ca3d992c0448607ecb8ebf34e81a5f21455e071fd5a3abb6474a1fa70998c24ac01f0109e056269c15d07bd9e149351d5ce5ef50419b9
diff --git a/tomcatjss.spec b/tomcatjss.spec
index 47076ed..b965640 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -7,9 +7,9 @@ URL:              http://www.dogtagpki.org/wiki/TomcatJSS
 License:          LGPLv2+
 BuildArch:        noarch
 
-Version:          7.4.1
-Release:          3%{?_timestamp}%{?_commit_id}%{?dist}
-# global           _phase -a1
+Version:          7.5.0
+Release:          0.1%{?_timestamp}%{?_commit_id}%{?dist}
+%global           _phase -a1
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/tomcatjss.git
@@ -57,7 +57,7 @@ BuildRequires:    slf4j-jdk14
 %if 0%{?rhel} && 0%{?rhel} <= 7
 BuildRequires:    jss >= 4.4.0-7
 %else
-BuildRequires:    jss >= 4.6.0
+BuildRequires:    jss >= 4.7.0
 %endif
 
 # Tomcat
@@ -71,7 +71,7 @@ BuildRequires:    tomcat >= 8.0.49
 BuildRequires:    tomcat >= 1:8.5.23
 %else
 %if 0%{?rhel}
-BuildRequires:    pki-servlet-container >= 1:9.0.7
+BuildRequires:    pki-servlet-engine >= 1:9.0.7
 %else
 BuildRequires:    tomcat >= 1:9.0.7
 %endif
@@ -104,7 +104,7 @@ Requires:         slf4j-jdk14
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:         jss >= 4.4.0-7
 %else
-Requires:         jss >= 4.6.0
+Requires:         jss >= 4.7.0
 %endif
 
 # Tomcat
@@ -118,7 +118,7 @@ Requires:         tomcat >= 8.0.49
 Requires:         tomcat >= 1:8.5.23
 %else
 %if 0%{?rhel}
-Requires:         pki-servlet-container >= 1:9.0.7
+Requires:         pki-servlet-engine >= 1:9.0.7
 %else
 Requires:         tomcat >= 1:9.0.7
 %endif
@@ -126,12 +126,6 @@ Requires:         tomcat >= 1:9.0.7
 %endif
 %endif
 
-# The 'tomcatjss' package conflicts with the 'tomcat-native' package
-# because it uses an underlying NSS security model rather than the
-# OpenSSL security model, so these two packages may not co-exist.
-# (see Bugzilla Bug #441974 for details)
-Conflicts:        tomcat-native
-
 # PKI
 Conflicts:        pki-base < 10.6.5
 
@@ -182,6 +176,8 @@ ant -f build.xml \
 %files
 ################################################################################
 
+%license LICENSE
+
 %defattr(-,root,root)
 %doc README
 %doc LICENSE
@@ -189,6 +185,10 @@ ant -f build.xml \
 
 ################################################################################
 %changelog
+* Wed Jun 10 2020 Dogtag PKI Team <pki-devel@redhat.com> - 7.5.0-0.1
+- Rebase to match latest upstream version v7.5.0-a1
+- Make TomcatJSS use both SunJSSE and Mozilla-JSS
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild