Fix Tomcat dependencies

Resolves: https://issues.redhat.com/browse/RHEL-12764

.gitignore

@@ -1,2 +1,4 @@
 SOURCES/tomcatjss-7.7.1.tar.gz
 /tomcatjss-7.7.1.tar.gz
+/tomcatjss-7.7.3.tar.gz
+/tomcatjss-7.8.0-alpha1.tar.gz

sources

@@ -1 +1 @@
-SHA512 (tomcatjss-7.7.1.tar.gz) = dbec1d1090fe4640e967ae7631255a64e9c268a06b89bd1c07de0437b86c6be4749d3823d2f22bb4737ff361e79bc1611baa91dc92671c9cdf13d529288c0e62
+SHA512 (tomcatjss-7.8.0-alpha1.tar.gz) = 8e813c4592dd44662d611cbbbcf0237c89ad4738430940b077434278d3ebb18ee4612c95fa78e710cb040c2156f906c94f00a2f6e8e0bf065385a4e1fe56f9cc

tomcatjss.spec

@@ -2,16 +2,24 @@
 Name:             tomcatjss
 ################################################################################
 
+%global           product_id idm-tomcatjss
+
+# Upstream version number:
+%global           major_version 7
+%global           minor_version 8
+%global           update_version 0
+
 Summary:          JSS Connector for Apache Tomcat
-URL:              http://www.dogtagpki.org/wiki/TomcatJSS
-License:          LGPLv2+
+URL:              https://github.com/dogtagpki/tomcatjss
+License:          LGPLv2+ and Apache-2.0
 BuildArch:        noarch
 
 # For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
 # For official (i.e. supported) releases, use x.y.z-r where r >=1.
-Version:          7.7.1
-Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
-#global           _phase -alpha1
+%global           release_number 0.1
+Version:          %{major_version}.%{minor_version}.%{update_version}
+Release:          %{release_number}%{?_timestamp}%{?_commit_id}%{?dist}
+%global           _phase -alpha1
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/tomcatjss.git
@@ -63,19 +71,23 @@ BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
 
 # JSS
-BuildRequires:    jss >= 4.9.0, jss < 5.0.0
+BuildRequires:    jss >= 4.10.0, jss < 5.0.0
 
 # Tomcat
-%if 0%{?rhel} && ! 0%{?eln}
-BuildRequires:    pki-servlet-engine >= 1:9.0.7
-%else
-BuildRequires:    tomcat >= 1:9.0.7
-%endif
+BuildRequires:    tomcat
+
+%description
+JSS Connector for Apache Tomcat, installed via the tomcatjss package,
+is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that
+uses Java Security Services (JSS), a Java interface to Network Security
+Services (NSS).
 
 ################################################################################
-# Runtime Dependencies
+%package -n %{product_id}
 ################################################################################
 
+Summary:          JSS Connector for Apache Tomcat
+
 # Java
 Requires:         apache-commons-lang3
 Requires:         %{java_headless}
@@ -86,14 +98,15 @@ Requires:         slf4j
 Requires:         slf4j-jdk14
 
 # JSS
-Requires:         jss >= 4.9.0, jss < 5.0.0
+Requires:         jss >= 4.10.0, jss < 5.0.0
 
 # Tomcat
-%if 0%{?rhel} && ! 0%{?eln}
-Requires:         pki-servlet-engine >= 1:9.0.7
-%else
-Requires:         tomcat >= 1:9.0.7
-%endif
+Requires:         tomcat
+
+Obsoletes:        tomcatjss < %{version}-%{release}
+Provides:         tomcatjss = %{version}-%{release}
+Provides:         tomcatjss = %{major_version}.%{minor_version}
+Provides:         %{product_id} = %{major_version}.%{minor_version}
 
 # PKI
 Conflicts:        pki-base < 10.10.0
@@ -104,7 +117,7 @@ Conflicts:        pki-base < 10.10.0
 %define           _sharedstatedir    /var/lib
 %endif
 
-%description
+%description -n %{product_id}
 JSS Connector for Apache Tomcat, installed via the tomcatjss package,
 is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that
 uses Java Security Services (JSS), a Java interface to Network Security
@@ -128,12 +141,12 @@ ant -f build.xml \
     -Dversion=%{version} \
     -Dsrc.dir=$app_server \
     -Djnidir=%{_jnidir} \
-    -Dinstall.doc.dir=%{buildroot}%{_docdir}/%{name} \
+    -Dinstall.doc.dir=%{buildroot}%{_docdir}/%{product_id} \
     -Dinstall.jar.dir=%{buildroot}%{_javadir} \
     install
 
 ################################################################################
-%files
+%files -n %{product_id}
 ################################################################################
 
 %license LICENSE
@@ -145,6 +158,12 @@ ant -f build.xml \
 
 ################################################################################
 %changelog
+* Tue Jan 16 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 7.8.0-0.1
+- Rebase to TomcatJSS 7.8.0-alpha1
+
+* Mon Jan 15 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.3-1
+- Replace pki-servlet-engine with tomcat
+
 * Mon Nov 15 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 7.7.1-1
 - Rebase to TomcatJSS 7.7.1