diff --git a/tomcat.spec b/tomcat.spec index 6173b3c30f106d0b9d1d5946f4b1e39513aede72..3ad48d217a0a30e166169d42b878e6f4a2f41855 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -14,7 +14,7 @@ Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API Name: tomcat Version: 9.0.117 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: http://tomcat.apache.org/ Source0: https://dlcdn.apache.org/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz @@ -43,12 +43,12 @@ BuildRequires: ant ecj findutils java-devel javapackages-local systemd BuildRequires: javapackages-common # Conditional BuildRequires based on distribution -%if "%{dist}" == ".tl4" -# TS4 uses Maven 3.8.6 and separate aqute-bnd packages +%if "%{dist}" == ".tl4" || "%{dist}" == ".oc9" +# TS4 and OC9 use Maven 3.8.6 and separate aqute-bnd packages BuildRequires: maven >= 3.8.6 BuildRequires: aqute-bnd aqute-bndlib %else -# OCS uses Maven 3.9.9 with built-in bnd +# OCS23 uses Maven 3.9.9 with built-in bnd BuildRequires: maven >= 3.9.9 BuildRequires: maven-buildrequires >= 3.9.9 %endif @@ -156,7 +156,7 @@ touch HACK -Dnsis.exe="HACK" \ -Djaxrpc-lib.jar="HACK" \ -Dwsdl4j-lib.jar="HACK" \ -%if "%{dist}" == ".tl4" +%if "%{dist}" == ".tl4" || "%{dist}" == ".oc9" -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ -Dbnd-annotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ %else @@ -270,14 +270,19 @@ popd %mvn_artifact res/maven/tomcat-jsp-api.pom output/build/lib/jsp-api.jar %mvn_artifact res/maven/tomcat-servlet-api.pom output/build/lib/servlet-api.jar +%if "%{dist}" == ".tl4" || "%{dist}" == ".oc9" +# TS4/OC9: Use mvn_install to generate Maven provides via .mfiles +%mvn_install +%else +# OCS23: Manual installation only (no Maven provides needed) mkdir -p %{buildroot}/usr/share/maven-poms/tomcat -mkdir -p %{buildroot}/usr/share/maven-metadata install -pm 0644 output/build/lib/el-api.jar %{buildroot}/usr/share/java/tomcat/tomcat-el-api.jar install -pm 0644 res/maven/tomcat-el-api.pom %{buildroot}/usr/share/maven-poms/tomcat install -pm 0644 output/build/lib/jsp-api.jar %{buildroot}/usr/share/java/tomcat/tomcat-jsp-api.jar install -pm 0644 res/maven/tomcat-jsp-api.pom %{buildroot}/usr/share/maven-poms/tomcat install -pm 0644 output/build/lib/servlet-api.jar %{buildroot}/usr/share/java/tomcat/tomcat-servlet-api.jar install -pm 0644 res/maven/tomcat-servlet-api.pom %{buildroot}/usr/share/maven-poms/tomcat +%endif %pre getent group tomcat >/dev/null || %{_sbindir}/groupadd -f -g %{tcuid} -r tomcat @@ -401,13 +406,23 @@ fi %exclude %{_javadir}/%{name}-el-%{elspec}-api.jar %exclude %{_javadir}/%{name}-jsp-%{jspspec}*.jar +%if "%{dist}" == ".tl4" || "%{dist}" == ".oc9" +%files jsp-%{jspspec}-api -f .mfiles-tomcat-jsp-api +%{_javadir}/%{name}-jsp-%{jspspec}*.jar +%else %files jsp-%{jspspec}-api %{_javadir}/%{name}-jsp-%{jspspec}*.jar %attr(0755,root,root) %dir %_datadir/maven-poms/tomcat %attr(0644,root,root) %_datadir/maven-poms/tomcat/tomcat-jsp-api.pom %attr(0755,root,root) %dir %_datadir/java/tomcat %attr(0644,root,root) %_datadir/java/tomcat/tomcat-jsp-api.jar +%endif +%if "%{dist}" == ".tl4" || "%{dist}" == ".oc9" +%files servlet-%{servletspec}-api -f .mfiles-tomcat-servlet-api +%doc LICENSE +%{_javadir}/%{name}-servlet-%{servletspec}*.jar +%else %files servlet-%{servletspec}-api %doc LICENSE %{_javadir}/%{name}-servlet-%{servletspec}*.jar @@ -415,7 +430,14 @@ fi %attr(0644,root,root) %_datadir/maven-poms/tomcat/tomcat-servlet-api.pom %attr(0755,root,root) %dir %_datadir/java/tomcat %attr(0644,root,root) %_datadir/java/tomcat/tomcat-servlet-api.jar +%endif +%if "%{dist}" == ".tl4" || "%{dist}" == ".oc9" +%files el-%{elspec}-api -f .mfiles-tomcat-el-api +%doc LICENSE +%{_javadir}/%{name}-el-%{elspec}-api.jar +%{_javadir}/%{name}/%{name}-el-%{elspec}-api.jar +%else %files el-%{elspec}-api %doc LICENSE %{_javadir}/%{name}-el-%{elspec}-api.jar @@ -424,12 +446,17 @@ fi %attr(0644,root,root) %_datadir/maven-poms/tomcat/tomcat-el-api.pom %attr(0755,root,root) %dir %_datadir/java/tomcat %attr(0644,root,root) %_datadir/java/tomcat/tomcat-el-api.jar +%endif %files webapps %defattr(0644,tomcat,tomcat,0755) %{_var}/lib/%{name}/webapps/ROOT %changelog +* Wed Apr 22 2026 Doris Chao - 9.0.117-2 +- [Type] bugfix +- [DESC] Add OC9 support and restore %mvn_install with .mfiles for Maven metadata generation for TS4/OC9 compatibility + * Fri Apr 17 2026 Doris Chao - 9.0.117-1 - [Type] security - [DESC] Update to version 9.0.117 to fix multiple CVEs: