diff --git a/.gitignore b/.gitignore index c87c6c8..3eab4fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/tomcatjss-7.7.0-alpha1.tar.gz +SOURCES/tomcatjss-7.7.0.tar.gz diff --git a/.tomcatjss.metadata b/.tomcatjss.metadata index 0292559..d29f765 100644 --- a/.tomcatjss.metadata +++ b/.tomcatjss.metadata @@ -1 +1 @@ -6d666680cbd4e5488fbef573642b5cd9af49a427 SOURCES/tomcatjss-7.7.0-alpha1.tar.gz +abde08950f904b45086e8069386acb8f77b4b923 SOURCES/tomcatjss-7.7.0.tar.gz diff --git a/SPECS/tomcatjss.spec b/SPECS/tomcatjss.spec index 081177c..94cb300 100644 --- a/SPECS/tomcatjss.spec +++ b/SPECS/tomcatjss.spec @@ -10,8 +10,8 @@ BuildArch: noarch # For development (i.e. unsupported) releases, use x.y.z-0.n.. # For official (i.e. supported) releases, use x.y.z-r where r >=1. Version: 7.7.0 -Release: 0.1.alpha1%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -alpha1 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +#global _phase -alpha1 # To generate the source tarball: # $ git clone https://github.com/dogtagpki/tomcatjss.git @@ -63,7 +63,7 @@ BuildRequires: slf4j BuildRequires: slf4j-jdk14 # JSS -BuildRequires: jss >= 4.8.0 +BuildRequires: jss >= 4.9.0, jss < 5.0.0 # Tomcat %if 0%{?rhel} && ! 0%{?eln} @@ -86,7 +86,7 @@ Requires: slf4j Requires: slf4j-jdk14 # JSS -Requires: jss >= 4.8.0 +Requires: jss >= 4.9.0, jss < 5.0.0 # Tomcat %if 0%{?rhel} && ! 0%{?eln} @@ -145,6 +145,9 @@ ant -f build.xml \ ################################################################################ %changelog +* Mon Jul 26 2021 Red Hat PKI Team 7.7.0-1 +- Rebase to TomcatJSS 7.7.0 + * Fri Jun 11 2021 Red Hat PKI Team 7.7.0-0.1 - Rebase to TomcatJSS 7.7.0-alpha1