Rebase to Tomcat JSS 8.3.0

.gitignore

@@ -37,3 +37,4 @@ tomcatjss-1.2.0.tar.gz
 /tomcatjss-8.2.0-beta1.tar.gz
 /tomcatjss-8.2.0-beta2.tar.gz
 /tomcatjss-8.2.0.tar.gz
+/tomcatjss-8.3.0.tar.gz

sources

@@ -1 +1 @@
-SHA512 (tomcatjss-8.2.0.tar.gz) = f2a1e2c3f3e2902a3aab86b5caffd9a2f13fa1931c760c8488b6733c2fe558fa4b83a416683fa5851ee93f2b7e5f71931a82d0d8aa499572d45e5e28b810fb37
+SHA512 (tomcatjss-8.3.0.tar.gz) = 92e334db1e60e1702f868c0535820c91d39db9395754c00684ccd84f76f61ecc2d11534bc98ff21e99e52733d7fd19bc9c6b4ad93411e1ff007dcb13ee7e3cce

tomcatjss.spec

@@ -6,7 +6,7 @@ Name:             tomcatjss
 
 # Upstream version number:
 %global           major_version 8
-%global           minor_version 2
+%global           minor_version 3
 %global           update_version 0
 
 # Downstream release number:
@@ -18,7 +18,7 @@ Name:             tomcatjss
 # - development (unsupported): alpha<n> where n >= 1
 # - stabilization (unsupported): beta<n> where n >= 1
 # - GA/update (supported): <none>
-%undefine         phase
+#global           phase
 
 %undefine         timestamp
 %undefine         commit_id
@@ -26,10 +26,8 @@ Name:             tomcatjss
 Summary:          JSS Connector for Apache Tomcat
 URL:              https://github.com/dogtagpki/tomcatjss
 License:          LGPLv2+
-BuildArch:        noarch
-ExclusiveArch:  %{java_arches} noarch
 Version:          %{major_version}.%{minor_version}.%{update_version}
-Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.3
+Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/tomcatjss.git
@@ -48,6 +46,9 @@ Source:           https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?p
 #     > tomcatjss-VERSION-RELEASE.patch
 # Patch: tomcatjss-VERSION-RELEASE.patch
 
+BuildArch:        noarch
+ExclusiveArch:    %{java_arches} noarch
+
 ################################################################################
 # Java
 ################################################################################
@@ -75,7 +76,7 @@ BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
 
 # JSS
-BuildRequires:    jss >= 5.2.0
+BuildRequires:    jss = 5.3
 
 # Tomcat
 %if 0%{?rhel} && ! 0%{?eln}
@@ -106,7 +107,7 @@ Requires:         slf4j
 Requires:         slf4j-jdk14
 
 # JSS
-Requires:         jss >= 5.2.0
+Requires:         jss = 5.3
 
 # Tomcat
 %if 0%{?rhel} && ! 0%{?eln}
@@ -117,6 +118,8 @@ Requires:         tomcat >= 1:9.0.7
 
 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
@@ -180,6 +183,9 @@ export JAVA_HOME=%{java_home}
 
 ################################################################################
 %changelog
+* Tue Feb 07 2023 Dogtag PKI Team <devel@lists.dogtagpki.org> - 8.3.0-1
+- Rebase to Tomcat JSS 8.3.0
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.2.0-1.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild