mbooth pushed to eclipse (master). "Avoid incorrect servlet-api when building on F22"

[notifications at fedoraproject.org]

From 291d3414617ec7246fb72cb4e47d2b59bd7d891e Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth at redhat.com>
Date: Wed, 10 Jun 2015 13:49:56 +0100
Subject: Avoid incorrect servlet-api when building on F22


diff --git a/eclipse.spec b/eclipse.spec
index 03dd9d8..d3118cf 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -503,6 +503,7 @@ sed -i 's/javax\.el/com\.sun\.el\.javax\.el/' \
 # Use javax.servlet-api (Glassfish) instead of javax.servlet (Tomcat)
 find -name feature.xml | xargs sed -i -e 's|"javax.servlet"|"javax.servlet-api"|'
 sed -i -e "s|<id>javax.servlet</id>|<id>javax.servlet-api</id>|g" eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
+sed -i -e "2iRequire-Bundle: javax.servlet-api" rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty9/META-INF/MANIFEST.MF
 
 %pom_remove_plugin  org.mortbay.jetty:jetty-jspc-maven-plugin  eclipse.platform.ua/org.eclipse.help.webapp
 
@@ -1049,6 +1050,7 @@ fi
 %changelog
 * Wed Jun 10 2015 Alexander Kurtakov <akurtako at redhat.com> 1:4.5.0-0.26.git201506012000
 - Add patch for stricter feature packaging.
+- Avoid incorrect servlet-api when building on F22
 
 * Thu Jun 04 2015 Michael Simacek <msimacek at redhat.com> - 1:4.5.0-0.25.git201506012000
 - Rebuild after ecf rebuild
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/eclipse.git/commit/?h=master&id=291d3414617ec7246fb72cb4e47d2b59bd7d891e