Reinstate Maven artifacts and fix maven-metadata JAR path
This commit is contained in:
parent
8cc30cfbf2
commit
18826faa62
|
@ -58,7 +58,7 @@
|
||||||
Name: pki-servlet-container
|
Name: pki-servlet-container
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: %{major_version}.%{minor_version}.%{micro_version}
|
Version: %{major_version}.%{minor_version}.%{micro_version}
|
||||||
Release: 12%{?dist}
|
Release: 13%{?dist}
|
||||||
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
|
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
|
@ -294,7 +294,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 -f "tomcat-servlet-api"
|
%add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-%{servletspec}-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}/
|
||||||
|
@ -455,6 +455,9 @@ fi
|
||||||
%{_mavenpomdir}/JPP-tomcat-servlet-api.pom
|
%{_mavenpomdir}/JPP-tomcat-servlet-api.pom
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Aug 03 2018 Fraser Tweedale <ftweedal@redhat.com> - 1:9.0.7-13
|
||||||
|
- Reinstate Maven artifacts and fix maven-metadata JAR path
|
||||||
|
|
||||||
* Fri Jul 20 2018 Jean-Frederic Clere <jclere@redhat.com> - 1:9.0.7-12
|
* Fri Jul 20 2018 Jean-Frederic Clere <jclere@redhat.com> - 1:9.0.7-12
|
||||||
- Add missing BuildRequires: systemd-units
|
- Add missing BuildRequires: systemd-units
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue