akurtakov pushed to eclipse (master). "Fix building without tomcat-servlet again."

[notifications at fedoraproject.org]

From 1ce34dbb47ba7975f6b38fcbc52b4b3e993163cd Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako at redhat.com>
Date: Fri, 29 May 2015 19:14:08 +0300
Subject: Fix building without tomcat-servlet again.


diff --git a/eclipse.spec b/eclipse.spec
index ab0b8f6..8ec6ca6 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -37,7 +37,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        0.20.git201505272010%{?dist}
+Release:        0.21.git201505272010%{?dist}
 License:        EPL
 URL:            http://www.eclipse.org/
 
@@ -484,6 +484,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
 
 %pom_remove_plugin  org.mortbay.jetty:jetty-jspc-maven-plugin  eclipse.platform.ua/org.eclipse.help.webapp
 
@@ -1028,6 +1029,9 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Fri May 29 2015 Alexander Kurtakov <akurtako at redhat.com> 1:4.5.0-0.21.git201505272010
+- Fix building without tomcat-servlet again.
+
 * Fri May 29 2015 Alexander Kurtakov <akurtako at redhat.com> 1:4.5.0-0.20.git201505272010
 - BR gcc not gcc-c++ as there is no cpp sources built.
 
-- 
cgit v0.10.2


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