diff --git a/SPECS/tomcat.spec b/SPECS/tomcat.spec
index bce4ff1..141496d 100644
--- a/SPECS/tomcat.spec
+++ b/SPECS/tomcat.spec
@@ -56,7 +56,7 @@
 Name:          tomcat
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       11%{?dist}.3
+Release:       37%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 License:       ASL 2.0
@@ -89,7 +89,6 @@ BuildArch:     noarch
 BuildRequires: ant
 BuildRequires: ecj >= 1:4.10
 BuildRequires: findutils
-BuildRequires: java-devel >= 1:1.8.0
 BuildRequires: javapackages-local
 BuildRequires: aqute-bnd
 BuildRequires: aqute-bndlib
@@ -106,7 +105,8 @@ Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
 
-Conflicts: pki-servlet-engine <= 1:9.0.50
+Provides:  pki-servlet-engine
+Obsoletes: pki-servlet-engine
 
 # added after log4j sub-package was removed
 Provides:         %{name}-log4j = %{epoch}:%{version}-%{release}
@@ -141,7 +141,7 @@ Provides: jsp = %{jspspec}
 Obsoletes: %{name}-jsp-2.2-api
 Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
-Conflicts: pki-servlet-engine <= 1:9.0.50
+Obsoletes: pki-servlet-engine
 
 %description jsp-%{jspspec}-api
 Apache Tomcat JSP API Implementation Classes.
@@ -153,7 +153,7 @@ Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
 Requires: ecj >= 1:4.10
 Requires(preun): coreutils
-Conflicts: pki-servlet-engine <= 1:9.0.50
+Obsoletes: pki-servlet-engine
 
 %description lib
 Libraries needed to run the Tomcat Web container.
@@ -164,7 +164,8 @@ Provides: servlet = %{servletspec}
 Provides: servlet6
 Provides: servlet3
 Obsoletes: %{name}-servlet-3.1-api
-Conflicts: pki-servlet-4.0-api <= 1:9.0.50
+Provides:  pki-servlet-4.0-api
+Obsoletes: pki-servlet-4.0-api
 
 %description servlet-%{servletspec}-api
 Apache Tomcat Servlet API Implementation Classes.
@@ -173,7 +174,7 @@ Apache Tomcat Servlet API Implementation Classes.
 Summary: Apache Tomcat Expression Language v%{elspec} API Implementation Classes
 Provides: el_api = %{elspec}
 Obsoletes: %{name}-el-2.2-api
-Conflicts: pki-servlet-engine <= 1:9.0.50
+Obsoletes: pki-servlet-engine
 
 %description el-%{elspec}-api
 Apache Tomcat EL API Implementation Classes.