commit 4bbbd3e6c6fd9d8cc7e0168a17a9a0333e337672
Author: Ivan Afonichev <ivan.afonichev(a)gmail.com>
Date: Mon Mar 31 00:10:23 2014 +0400
Don't provide maven javax.jsp:jsp-api and javax.servlet.jsp:javax.servlet.jsp-api
resolves: rhbz#1076949
tomcat.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index 3715583..1c06b1e 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
@@ -463,7 +463,7 @@ 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,org.eclipse.jetty.orbit:javax.servlet.jsp"
+%add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api"
-a "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,org.eclipse.jetty.orbit:javax.el"
@@ -680,6 +680,10 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
+* Sun Mar 30 2014 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.52-2
+- Don't provide maven javax.jsp:jsp-api and javax.servlet.jsp:javax.servlet.jsp-api
resolves: rhbz#1076949
+- Move log4j support into subpackage, resolves: rhbz#1027716
+
* Wed Mar 26 2014 Ivan Afonichev <ivan.afonichev(a)gmail.com> 0:7.0.52-1
- Updated to 7.0.52
- Rewrite jsvc implementation, resolves: rhbz#1051743
Show replies by date