Drop jetty alias for servlet.
XMvn ignores duplicate provides so better to drop the jetty alias.
This commit is contained in:
parent
62f8d6a913
commit
a599bc57f3
@ -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}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user