diff --git a/.gitignore b/.gitignore index b0d635a..21baf4a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/tomcatjss-8.2.0.tar.gz +SOURCES/tomcatjss-8.3.0.tar.gz diff --git a/.tomcatjss.metadata b/.tomcatjss.metadata index 6b0813b..caef982 100644 --- a/.tomcatjss.metadata +++ b/.tomcatjss.metadata @@ -1 +1 @@ -c0d87b43c504ca06dec58ae9cc9008366f4689ab SOURCES/tomcatjss-8.2.0.tar.gz +6acc0d2d8b30d9ac8e02dfa9b28b73b7226f3004 SOURCES/tomcatjss-8.3.0.tar.gz diff --git a/SPECS/tomcatjss.spec b/SPECS/tomcatjss.spec index aa74cf2..1c31ccf 100644 --- a/SPECS/tomcatjss.spec +++ b/SPECS/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 where n >= 1 # - stabilization (unsupported): beta where n >= 1 # - GA/update (supported): -%undefine phase +#global phase %undefine timestamp %undefine commit_id @@ -26,7 +26,6 @@ Name: tomcatjss Summary: JSS Connector for Apache Tomcat URL: https://github.com/dogtagpki/tomcatjss License: LGPLv2+ -BuildArch: noarch Version: %{major_version}.%{minor_version}.%{update_version} Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} @@ -47,6 +46,8 @@ Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?p # > tomcatjss-VERSION-RELEASE.patch # Patch: tomcatjss-VERSION-RELEASE.patch +BuildArch: noarch + ################################################################################ # Java ################################################################################ @@ -74,7 +75,7 @@ BuildRequires: slf4j BuildRequires: slf4j-jdk14 # JSS -BuildRequires: jss >= 5.2.0 +BuildRequires: jss = 5.3 # Tomcat %if 0%{?rhel} && ! 0%{?eln} @@ -105,7 +106,7 @@ Requires: slf4j Requires: slf4j-jdk14 # JSS -Requires: jss >= 5.2.0 +Requires: jss = 5.3 # Tomcat %if 0%{?rhel} && ! 0%{?eln} @@ -116,6 +117,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 +182,12 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Fri Feb 10 2023 Red Hat PKI Team - 8.3.0-1 +- Rebase to Tomcat JSS 8.3.0 + +* Wed Nov 30 2022 Red Hat PKI Team - 8.3.0-0.2.beta1 +- Rebase to Tomcat JSS 8.3.0-beta1 + * Thu Jun 30 2022 Red Hat PKI Team - 8.2.0-1 - Rebase to Tomcat JSS 8.2.0