Attachment 704942 Details for Bug 917626 – Proposed patch

[patch] Proposed patch

mizdebsk_rhbz917626.patch (text/plain), 2.84 KB, created by Mikolaj Izdebski on 2013-03-04 12:34:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikolaj Izdebski

Created: 2013-03-04 12:34:28 UTC

Size: 2.84 KB

patch

obsolete

>From bc69ca44af996b5bccee97eca6f7097d496a10d3 Mon Sep 17 00:00:00 2001
>From: Mikolaj Izdebski <mizdebsk@redhat.com>
>Date: Mon, 4 Mar 2013 13:34:10 +0100
>Subject: [PATCH] Add depmaps for org.eclipse.jetty.orbit
>
>- Resolves: rhbz#917626
>---
> tomcat.spec | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
>diff --git a/tomcat.spec b/tomcat.spec
>index 14867b9..4114ba3 100644
>--- a/tomcat.spec
>+++ b/tomcat.spec
>@@ -54,7 +54,7 @@
> Name:          tomcat
> Epoch:         0
> 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
> 
> Group:         System Environment/Daemons
>@@ -462,16 +462,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 ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom
>-%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "javax.servlet.jsp:javax.servlet.jsp-api,javax.servlet:jsp-api"
>+%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "javax.servlet.jsp:javax.servlet.jsp-api,javax.servlet:jsp-api,org.eclipse.jetty.orbit:javax.servlet.jsp"
> 
> %{__cp} -a tomcat-el-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-el-api.pom
>-%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "javax.el:javax.el-api,javax.el:el-api"
>+%add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "javax.el:javax.el-api,javax.el:el-api,org.eclipse.jetty.orbit:javax.el,org.eclipse.jetty.orbit:com.sun.el"
> 
> %{__cp} -a tomcat-servlet-api.pom ${RPM_BUILD_ROOT}%{_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 "tomcat-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 "tomcat-servlet-api" -a "javax.servlet:servlet-api,javax.servlet:javax.servlet-api,org.mortbay.jetty:servlet-api,org.eclipse.jetty.orbit:javax.servlet"
> 
> # two special pom where jar files have different names
> %{__cp} -a tomcat-tribes.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
>@@ -676,6 +676,10 @@ fi
> %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
> 
> %changelog
>+* Mon Mar  4 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:7.0.37-2
>+- Add depmaps for org.eclipse.jetty.orbit
>+- Resolves: rhbz#917626
>+
> * Wed Feb 20 2013 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.37-1
> - Updated to 7.0.37
> 
>-- 
>1.8.1.2
>

Actions: View | Diff

Attachments on bug 917626: 704942