diff --git a/sources b/sources index 63e6a2c..1cf78f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-tomcat-9.0.36-src.tar.gz) = f8263594bc679f75cecf5bcf4ad8e8ccfea42ad8e90eaeb7004c63875c6b700b0f863d68f1cdd932ebc7b303bdfb86d70afe88686e576c8ea7ccd9574c74e25b +SHA512 (apache-tomcat-9.0.37-src.tar.gz) = 6e819fe255c467b0081e91c17a53fa383fe84d922492c62d7dd93cabf00e22ab30872ecaa298a9b12977b8c7518f36c8429091b24c9fb5200db64e80e853ce98 diff --git a/tomcat-build.patch b/tomcat-build.patch index acaac9c..97440f1 100644 --- a/tomcat-build.patch +++ b/tomcat-build.patch @@ -1,12 +1,27 @@ ---- build.xml.orig 2018-08-07 10:32:04.994403913 -0400 -+++ build.xml 2018-08-07 10:32:30.874319588 -0400 -@@ -2989,6 +2989,9 @@ Read the Building page on the Apache Tom - +diff -up ./build.xml.orig ./build.xml +--- ./build.xml.orig 2020-07-13 12:59:09.555368724 -0400 ++++ ./build.xml 2020-07-13 13:06:51.246135917 -0400 +@@ -3307,6 +3307,11 @@ Read the Building page on the Apache Tom + + - ++ + + + ++ - + +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 +@@ -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} + + Specification-Title: Apache Tomcat + Specification-Version: ${version.major.minor} diff --git a/tomcat.spec b/tomcat.spec index cd38d0b..a705c9a 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -31,7 +31,7 @@ %global jspspec 2.3 %global major_version 9 %global minor_version 0 -%global micro_version 36 +%global micro_version 37 %global packdname apache-tomcat-%{version}-src %global servletspec 4.0 %global elspec 3.0 @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -239,6 +239,7 @@ export OPT_JAR_LIST="xalan-j2-serializer" -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ + -Dosgi-cmpn.jar="$(build-classpath osgi-compendium/osgi.cmpn)" \ -Dversion="%{version}" \ -Dversion.build="%{micro_version}" \ deploy dist-source @@ -619,6 +620,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Mon Jul 13 2020 Coty Sutherland - 1:9.0.37-1 +- Update to 9.0.37 + * Sat Jul 11 2020 Jiri Vanek - 1:9.0.36-2 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11