Add serlvet-api package back for FreeIPA
This commit is contained in:
parent
5061e0a17c
commit
be9ac2b0c2
@ -139,12 +139,6 @@ Obsoletes: %{name}-jsp-2.2-api
|
|||||||
Requires: ecj >= 1:4.6.3
|
Requires: ecj >= 1:4.6.3
|
||||||
Requires(preun): coreutils
|
Requires(preun): coreutils
|
||||||
|
|
||||||
#%%package servlet-%%{servletspec}-api
|
|
||||||
Provides: servlet = %{servletspec}
|
|
||||||
Provides: servlet6
|
|
||||||
Provides: servlet3
|
|
||||||
Obsoletes: %{name}-servlet-3.0-api
|
|
||||||
|
|
||||||
#%%package el-%%{elspec}-api
|
#%%package el-%%{elspec}-api
|
||||||
Provides: el_api = %{elspec}
|
Provides: el_api = %{elspec}
|
||||||
Obsoletes: %{name}-el-2.2-api
|
Obsoletes: %{name}-el-2.2-api
|
||||||
@ -159,6 +153,19 @@ Tomcat is developed in an open and participatory environment and
|
|||||||
released under the Apache Software License version 2.0. Tomcat is intended
|
released under the Apache Software License version 2.0. Tomcat is intended
|
||||||
to be a collaboration of the best-of-breed developers from around the world.
|
to be a collaboration of the best-of-breed developers from around the world.
|
||||||
|
|
||||||
|
%package servlet-%{servletspec}-api
|
||||||
|
Group: Development/Libraries
|
||||||
|
Summary: Apache Tomcat Java Servlet v%{servletspec} API Implementation Classes
|
||||||
|
Provides: servlet = %{servletspec}
|
||||||
|
Provides: servlet6
|
||||||
|
Provides: servlet3
|
||||||
|
Obsoletes: %{name}-servlet-3.1-api
|
||||||
|
Requires(post): chkconfig
|
||||||
|
Requires(postun): chkconfig
|
||||||
|
|
||||||
|
%description servlet-%{servletspec}-api
|
||||||
|
Apache Tomcat Servlet API Implementation Classes.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{packdname}
|
%setup -q -n %{packdname}
|
||||||
|
|
||||||
@ -364,7 +371,7 @@ done
|
|||||||
# Generate a depmap fragment javax.servlet:servlet-api pointing to
|
# Generate a depmap fragment javax.servlet:servlet-api pointing to
|
||||||
# tomcat-servlet-3.0-api for backwards compatibility
|
# tomcat-servlet-3.0-api for backwards compatibility
|
||||||
# also provide jetty depmap (originally in jetty package, but it's cleaner to have it here
|
# 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
|
%add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-api.jar -f "tomcat-servlet-api"
|
||||||
|
|
||||||
# replace temporary copy with link
|
# replace temporary copy with link
|
||||||
%{__ln_s} -f $(abs2rel %{bindir}/tomcat-juli.jar %{libdir}) ${RPM_BUILD_ROOT}%{libdir}/
|
%{__ln_s} -f $(abs2rel %{bindir}/tomcat-juli.jar %{libdir}) ${RPM_BUILD_ROOT}%{libdir}/
|
||||||
@ -510,10 +517,14 @@ fi
|
|||||||
%{_mavenpomdir}/JPP.%{name}-jni.pom
|
%{_mavenpomdir}/JPP.%{name}-jni.pom
|
||||||
%{_mavenpomdir}/JPP.%{name}-util-scan.pom
|
%{_mavenpomdir}/JPP.%{name}-util-scan.pom
|
||||||
%{_mavenpomdir}/JPP-%{name}-jsp-api.pom
|
%{_mavenpomdir}/JPP-%{name}-jsp-api.pom
|
||||||
%{_mavenpomdir}/JPP-%{name}-servlet-api.pom
|
|
||||||
%{_mavenpomdir}/JPP-%{name}-el-api.pom
|
%{_mavenpomdir}/JPP-%{name}-el-api.pom
|
||||||
%{_datadir}/maven-metadata/tomcat.xml
|
%{_datadir}/maven-metadata/tomcat.xml
|
||||||
|
|
||||||
|
%files servlet-%{servletspec}-api -f output/dist/src/res/maven/.mfiles-tomcat-servlet-api
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%doc LICENSE
|
||||||
|
%{_javadir}/%{name}-servlet-%{servletspec}*.jar
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Jun 08 2018 Coty Sutherland <csutherl@redhat.com> 9.0.7-1
|
* Fri Jun 08 2018 Coty Sutherland <csutherl@redhat.com> 9.0.7-1
|
||||||
- new package built with tito
|
- new package built with tito
|
||||||
|
Loading…
Reference in New Issue
Block a user