From a599bc57f39e7724aef4ec50780b552f473db8a6 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Thu, 18 Jun 2015 14:54:27 +0300
Subject: [PATCH] Drop jetty alias for servlet.

XMvn ignores duplicate provides so better to drop the jetty alias.
---
 tomcat.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tomcat.spec b/tomcat.spec
index e9e6882..491bed6 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -54,7 +54,7 @@
 Name:          tomcat
 Epoch:         1
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group:         System Environment/Daemons
@@ -490,7 +490,7 @@ done
 # 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 "tomcat-servlet-api" -a "org.mortbay.jetty:servlet-api,org.eclipse.jetty.orbit:javax.servlet"
+%add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-api.jar -f "tomcat-servlet-api"
 
 # replace temporary copy with link
 %{__ln_s} -f $(abs2rel %{bindir}/tomcat-juli.jar %{libdir}) ${RPM_BUILD_ROOT}%{libdir}/
@@ -686,6 +686,9 @@ fi
 %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
 
 %changelog
+* Thu Jun 18 2015 Alexander Kurtakov <akurtako@redhat.com> 1:8.0.20-3
+- Drop jetty alias for servlet.
+
 * Tue Jun 09 2015 Michal Srb <msrb@redhat.com> - 1:8.0.20-2
 - Fix metadata for org.apache.tomcat:{tomcat-jni,tomcat-util-scan}