diff --git a/tomcat.spec b/tomcat.spec index 22e25c2..ad3145e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -56,7 +56,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -92,8 +92,6 @@ BuildRequires: findutils BuildRequires: java-devel >= 1:1.8.0 BuildRequires: javapackages-local BuildRequires: aqute-bnd -BuildRequires: aqute-bndlib -BuildRequires: wsdl4j BuildRequires: systemd Requires: java-headless >= 1:1.8.0 @@ -224,14 +222,9 @@ touch HACK -Dcommons-daemon.native.win.mgr.exe="HACK" \ -Dnsis.exe="HACK" \ -Djaxrpc-lib.jar="HACK" \ - -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ + -Dwsdl4j-lib.jar="HACK" \ -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ - -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ - -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ - -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ -Dosgi-annotations.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 @@ -503,6 +496,9 @@ fi %{appdir}/ROOT %changelog +* Thu Sep 01 2022 Coty Sutherland - 1:9.0.65-2 +- Cleaning up some unused deps and system properties + * Thu Jul 21 2022 Hui Wang - 1:9.0.65-1 - Update to 9.0.65