From 8b4c6be1c692dfba42febdca263feb0fc26ba4d5 Mon Sep 17 00:00:00 2001
From: Hui Wang <huwang@redhat.com>
Date: Jul 25 2023 11:54:13 +0000
Subject: Related: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage


---

diff --git a/tomcat.spec b/tomcat.spec
index c1244ae..63070c6 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
@@ -354,14 +354,14 @@ 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
 
-%mvn_file org.apache.tomcat:tomcat-annotations-api annotations-api.jar
+%mvn_file org.apache.tomcat:tomcat-annotations-api tomcat/annotations-api
 %mvn_artifact res/maven/tomcat-annotations-api.pom ${RPM_BUILD_ROOT}%{libdir}/annotations-api.jar
 %mvn_artifact res/maven/tomcat-api.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-api.jar
-%mvn_file org.apache.tomcat:tomcat-catalina-ant catalina-ant.jar
+%mvn_file org.apache.tomcat:tomcat-catalina-ant tomcat/catalina-ant
 %mvn_artifact res/maven/tomcat-catalina-ant.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ant.jar
-%mvn_file org.apache.tomcat:tomcat-catalina-ha catalina-ha.jar
+%mvn_file org.apache.tomcat:tomcat-catalina-ha tomcat/catalina-ha
 %mvn_artifact res/maven/tomcat-catalina-ha.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ha.jar
-%mvn_file org.apache.tomcat:tomcat-catalina catalina.jar
+%mvn_file org.apache.tomcat:tomcat-catalina tomcat/catalina
 %mvn_artifact res/maven/tomcat-catalina.pom ${RPM_BUILD_ROOT}%{libdir}/catalina.jar
 %mvn_artifact res/maven/tomcat-coyote.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-coyote.jar
 %mvn_artifact res/maven/tomcat-dbcp.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-dbcp.jar
@@ -374,29 +374,31 @@ popd
 %mvn_artifact res/maven/tomcat-i18n-pt-BR.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-pt-BR.jar
 %mvn_artifact res/maven/tomcat-i18n-ru.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-ru.jar
 %mvn_artifact res/maven/tomcat-i18n-zh-CN.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-i18n-zh-CN.jar
-%mvn_file org.apache.tomcat:tomcat-jasper-el jasper-el.jar
+%mvn_file org.apache.tomcat:tomcat-jasper-el tomcat/jasper-el
 %mvn_artifact res/maven/tomcat-jasper-el.pom ${RPM_BUILD_ROOT}%{libdir}/jasper-el.jar
-%mvn_file org.apache.tomcat:tomcat-jasper jasper.jar
+%mvn_file org.apache.tomcat:tomcat-jasper tomcat/jasper
 %mvn_artifact res/maven/tomcat-jasper.pom ${RPM_BUILD_ROOT}%{libdir}/jasper.jar
-%mvn_file org.apache.tomcat:tomcat-jaspic-api jaspic-api.jar
+%mvn_file org.apache.tomcat:tomcat-jaspic-api tomcat/jaspic-api
 %mvn_artifact res/maven/tomcat-jaspic-api.pom ${RPM_BUILD_ROOT}%{libdir}/jaspic-api.jar
 %mvn_artifact res/maven/tomcat-jdbc.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-jdbc.jar
 %mvn_artifact res/maven/tomcat-jni.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-jni.jar
 %mvn_artifact res/maven/tomcat-juli.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-juli.jar
-%mvn_file org.apache.tomcat:tomcat-ssi catalina-ssi.jar
+%mvn_file org.apache.tomcat:tomcat-ssi tomcat/catalina-ssi
 %mvn_artifact res/maven/tomcat-ssi.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-ssi.jar
-%mvn_file org.apache.tomcat:tomcat-storeconfig catalina-storeconfig.jar
+%mvn_file org.apache.tomcat:tomcat-storeconfig tomcat/catalina-storeconfig
 %mvn_artifact res/maven/tomcat-storeconfig.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-storeconfig.jar
-%mvn_file org.apache.tomcat:tomcat-tribes catalina-tribes.jar
+%mvn_file org.apache.tomcat:tomcat-tribes tomcat/catalina-tribes
 %mvn_artifact res/maven/tomcat-tribes.pom ${RPM_BUILD_ROOT}%{libdir}/catalina-tribes.jar
 %mvn_artifact res/maven/tomcat-util-scan.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-util-scan.jar
 %mvn_artifact res/maven/tomcat-util.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-util.jar
-%mvn_file org.apache.tomcat:tomcat-websocket-api websocket-api.jar
+%mvn_file org.apache.tomcat:tomcat-websocket-api tomcat/websocket-api
 %mvn_artifact res/maven/tomcat-websocket-api.pom ${RPM_BUILD_ROOT}%{libdir}/websocket-api.jar
 %mvn_artifact res/maven/tomcat-websocket.pom ${RPM_BUILD_ROOT}%{libdir}/tomcat-websocket.jar
 %mvn_artifact res/maven/tomcat.pom
 
 %mvn_install
+#remove the jars which %mvn_file installs jars in the %{_javadir}
+%{__rm} ${RPM_BUILD_ROOT}%{_javadir}/*.jar
 
 %pre
 # add the tomcat user and group
@@ -549,6 +551,9 @@ fi
 %{appdir}/ROOT
 
 %changelog
+* Tue Jul 25 2023 Hui Wang <huwang@redhat.com> - 1:9.0.78-2
+- Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage
+
 * Tue Jul 25 2023 Hui Wang <huwang@redhat.com> - 1:9.0.78-1
 - Resolves: rhbz#2224318 There are duplicated jars in the tomcat lib-subpackage
 - Update to 9.0.78