diff --git a/.gitignore b/.gitignore
index 67701cd..dffe94a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/tomcatjss-7.4.1.tar.gz
+SOURCES/tomcatjss-7.5.0.tar.gz
diff --git a/.tomcatjss.metadata b/.tomcatjss.metadata
index 5cfe0c4..c1fffc7 100644
--- a/.tomcatjss.metadata
+++ b/.tomcatjss.metadata
@@ -1 +1 @@
-f0069873f3b72269add041f926f8a24e5abeabda SOURCES/tomcatjss-7.4.1.tar.gz
+c74c6e4ca0a0ba0d2252dce896d5b0f88bf8ba6d SOURCES/tomcatjss-7.5.0.tar.gz
diff --git a/SPECS/tomcatjss.spec b/SPECS/tomcatjss.spec
index 19919bf..8916b99 100644
--- a/SPECS/tomcatjss.spec
+++ b/SPECS/tomcatjss.spec
@@ -7,9 +7,9 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS
License: LGPLv2+
BuildArch: noarch
-Version: 7.4.1
-Release: 2%{?_timestamp}%{?_commit_id}%{?dist}
-# global _phase -a1
+Version: 7.5.0
+Release: 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
@@ -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
@@ -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,15 @@ ant -f build.xml \
################################################################################
%changelog
+* Thu Jul 09 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 7.5.0-1
+- Rebased to TomcatJSS 7.5.0
+
+* Thu Jun 25 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 7.5.0-0.2
+- Rebased to TomcatJSS 7.5.0-a2
+
+* Tue May 26 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 7.5.0-0.1
+- Rebased to TomcatJSS 7.5.0-a1
+
* Thu Oct 31 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 7.4.1-2
- Bumping min requirement for jss to 4.6.0