Rebase to TomcatJSS 7.8.0-alpha1

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

.gitignore

@@ -1,3 +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.3.tar.gz) = 7aa9a1e05f904efdec2e49613f444ca83a3323b9639316e38b374b17737707c458f72f4386fb8cb543b57a920a93fb782b264a379c2757bacf5d42db8d4cd56f
+SHA512 (tomcatjss-7.8.0-alpha1.tar.gz) = 0b6b5e411d2b12f16e3c1cfd5221243f0b79eea1b36997ce3cc3d38d9a79e8ae81c3aa2dce46b3e7a2af94d2bd89b232e4f537525efb4ea34b82f5035ac0748b

tomcatjss.spec

@@ -2,22 +2,24 @@
 Name:             tomcatjss
 ################################################################################
 
+%global           product_id idm-tomcatjss
+
 # Upstream version number:
 %global           major_version 7
-%global           minor_version 7
-%global           update_version 3
+%global           minor_version 8
+%global           update_version 0
 
 Summary:          JSS Connector for Apache Tomcat
-URL:              http://www.dogtagpki.org/wiki/TomcatJSS
+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.
-%global           release_number 1
+%global           release_number 0.1
 Version:          %{major_version}.%{minor_version}.%{update_version}
 Release:          %{release_number}%{?_timestamp}%{?_commit_id}%{?dist}
-#global           _phase
+%global           _phase -alpha1
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/tomcatjss.git
@@ -69,15 +71,23 @@ BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
 
 # JSS
-BuildRequires:    jss >= 4.9.0, jss < 5.0.0
+BuildRequires:    jss = 4.10
 
 # Tomcat
 BuildRequires:    tomcat >= 1:9.0.83
 
+%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}
@@ -88,11 +98,16 @@ Requires:         slf4j
 Requires:         slf4j-jdk14
 
 # JSS
-Requires:         jss >= 4.9.0, jss < 5.0.0
+Requires:         jss = 4.10
 
 # Tomcat
 Requires:         tomcat >= 1:9.0.83
 
+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
 
@@ -102,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
@@ -126,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
@@ -143,6 +158,9 @@ 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