Rebase to Tomcat JSS 8.3.0-beta1

Resolves: #2149485
This commit is contained in:
Endi S. Dewata 2022-11-30 13:07:21 +07:00
parent 6b87d1b96c
commit 7efaa22c47
3 changed files with 12 additions and 6 deletions

1
.gitignore vendored
View File

@ -35,3 +35,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-beta1.tar.gz

View File

@ -1 +1 @@
SHA512 (tomcatjss-8.2.0.tar.gz) = f2a1e2c3f3e2902a3aab86b5caffd9a2f13fa1931c760c8488b6733c2fe558fa4b83a416683fa5851ee93f2b7e5f71931a82d0d8aa499572d45e5e28b810fb37
SHA512 (tomcatjss-8.3.0-beta1.tar.gz) = 3aa2616b6b3eb9855cf40e6feb681b4f814586b499451deb6cad730140bd6e940afdd3070ab657faf22ac2de05309e50ba1a15eb3357b4de141805d097b64e6c

View File

@ -6,19 +6,19 @@ Name: tomcatjss
# Upstream version number:
%global major_version 8
%global minor_version 2
%global minor_version 3
%global update_version 0
# Downstream release number:
# - development/stabilization (unsupported): 0.<n> where n >= 1
# - GA/update (supported): <n> where n >= 1
%global release_number 1
%global release_number 0.2
# Development phase:
# - development (unsupported): alpha<n> where n >= 1
# - stabilization (unsupported): beta<n> where n >= 1
# - GA/update (supported): <none>
%undefine phase
%global phase beta1
%undefine timestamp
%undefine commit_id
@ -74,7 +74,7 @@ BuildRequires: slf4j
BuildRequires: slf4j-jdk14
# JSS
BuildRequires: jss >= 5.2.0
BuildRequires: jss = 5.3
# Tomcat
%if 0%{?rhel} && ! 0%{?eln}
@ -105,7 +105,7 @@ Requires: slf4j
Requires: slf4j-jdk14
# JSS
Requires: jss >= 5.2.0
Requires: jss = 5.3
# Tomcat
%if 0%{?rhel} && ! 0%{?eln}
@ -116,6 +116,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
@ -179,6 +181,9 @@ export JAVA_HOME=%{java_home}
################################################################################
%changelog
* Wed Nov 30 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.3.0-0.2.beta1
- Rebase to Tomcat JSS 8.3.0-beta1
* Thu Jun 30 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.2.0-1
- Rebase to Tomcat JSS 8.2.0