From 43eeb963a12061a4bfec708f0525d87beb3b6be168509b3abdb0ac60a81fec1e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 26 Jan 2019 09:42:01 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=147 --- tomcat.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tomcat.spec b/tomcat.spec index b6debd8..42f6da9 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -492,16 +492,16 @@ done # servlet-api jsp-api and el-api are not in tomcat subdir, since they are widely re-used elsewhere cp -a tomcat-jsp-api.pom %{buildroot}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom -%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f jsp-api -a "javax.servlet.jsp:javax.servlet.jsp-api,javax.servlet:jsp-api,org.eclipse.jetty.orbit:javax.servlet.jsp" +%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f jsp-api -a "org.eclipse.jetty.orbit:javax.servlet.jsp" cp -a tomcat-el-api.pom %{buildroot}%{_mavenpomdir}/JPP-tomcat-el-api.pom -%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f el-api -a "javax.el:javax.el-api,javax.el:el-api,org.eclipse.jetty.orbit:javax.el" +%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f el-api -a "org.eclipse.jetty.orbit:javax.el" cp -a tomcat-servlet-api.pom %{buildroot}%{_mavenpomdir}/JPP-tomcat-servlet-api.pom # Generate a depmap fragment javax.servlet:servlet-api pointing to # tomcat-servlet-3.0-api for backwards compatibility # also provide jetty depmap (originally in jetty package, but it's cleaner to have it here -%add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-api.jar -f servlet-api -a "javax.servlet:servlet-api,javax.servlet:javax.servlet-api,org.mortbay.jetty:servlet-api" +%add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-api.jar -f servlet-api -a "org.mortbay.jetty:servlet-api" # two special pom where jar files have different names cp -a tomcat-tribes.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom