diff --git a/9.0.80.tar.gz b/9.0.84.tar.gz similarity index 46% rename from 9.0.80.tar.gz rename to 9.0.84.tar.gz index 9974b87887898aca79f220b3997f6c8085f2e418..b7cc054e4e28111ca614c83df913cb06e480a08a 100644 Binary files a/9.0.80.tar.gz and b/9.0.84.tar.gz differ diff --git a/tomcat-build.patch b/tomcat-build.patch index 49c63ff5a01f6527848f7ed721c551515002a557..cdf73ef192a4cead92c17df8c01ed8c59bcd3b65 100644 --- a/tomcat-build.patch +++ b/tomcat-build.patch @@ -1,12 +1,19 @@ diff -up ./res/bnd/build-defaults.bnd.orig ./res/bnd/build-defaults.bnd ---- ./res/bnd/build-defaults.bnd.orig 2020-07-13 13:47:01.229077747 -0400 -+++ ./res/bnd/build-defaults.bnd 2020-07-13 13:47:12.923095618 -0400 +--- res/bnd/build-defaults.bnd.orig 2023-10-16 11:23:04.752754202 +0800 ++++ res/bnd/build-defaults.bnd 2023-10-16 11:23:29.931876910 +0800 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -Bundle-Version: ${version_cleanup;${version}} +Bundle-Version: ${version} + Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt Specification-Title: Apache Tomcat - Specification-Version: ${version.major.minor} +@@ -36,4 +36,4 @@ X-Compile-Target-JDK: ${compile.release} + + -removeheaders: DSTAMP,TODAY,TSTAMP + +-module.name: org.apache.${replace;${Bundle-Name};-;.} +\ No newline at end of file ++module.name: org.apache.${replace;${Bundle-Name};-;.} diff --git a/tomcat.spec b/tomcat.spec index 591f16de891035c69c76fceef2d8589f0d02657c..e2aa164cc9861a41e9176786bc2f0a62dc0b8356 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -3,7 +3,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 80 +%global micro_version 84 %global packdname tomcat-%{version} %global servletspec 4.0 %global elspec 3.0 @@ -550,6 +550,9 @@ fi %doc {NOTICE,RELEASE*} %changelog +* Wed Dec 13 2023 Funda Wang - 1:9.0.84-1 +- New version 9.0.84 + * Sat Aug 26 2023 Funda Wang - 1:9.0.80-1 - New version 9.0.80