rpms/pki-servlet-engine
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/tomcat

Browse Source
This commit is contained in:
Coty Sutherland 2018-02-01 08:52:17 -05:00
commit f083e18135
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tomcat.spec
View File

@ -57,7 +57,7 @@
Name: tomcat Name: tomcat
Epoch: 1 Epoch: 1
Version: %{major_version}.%{minor_version}.%{micro_version} 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 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons Group: System Environment/Daemons
@ -100,7 +100,7 @@ BuildRequires: apache-commons-pool
BuildRequires: tomcat-taglibs-standard BuildRequires: tomcat-taglibs-standard
BuildRequires: java-devel >= 1:1.6.0 BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.7.0 BuildRequires: jpackage-utils >= 0:1.7.0
%if 0%{?fedora} >= 27 %if 0%{?fedora} >= 27 || 0%{?rhel} > 7
# add_maven_depmap is deprecated, using javapackages-local for now # add_maven_depmap is deprecated, using javapackages-local for now
# See https://fedora-java.github.io/howto/latest/#_add_maven_depmap_macro # See https://fedora-java.github.io/howto/latest/#_add_maven_depmap_macro
BuildRequires: javapackages-local BuildRequires: javapackages-local
@ -693,6 +693,9 @@ fi
* Thu Feb 01 2018 Coty Sutherland <csutherl@redhat.com> - 1:8.0.49-1 * Thu Feb 01 2018 Coty Sutherland <csutherl@redhat.com> - 1:8.0.49-1
- Update to 8.0.49 - Update to 8.0.49
* Tue Dec 12 2017 Merlin Mathesius <mmathesi@redhat.com> - 1:8.0.47-3
- Cleanup spec file conditionals
* Tue Oct 24 2017 Troy Dawson <tdawson@redhat.com> - 1:8.0.47-2 * Tue Oct 24 2017 Troy Dawson <tdawson@redhat.com> - 1:8.0.47-2
- Change "zip -u" to "zip" - Change "zip -u" to "zip"
- Resolves: rhbz#1495241 [tomcat] zip -u in spec file causes race condition - Resolves: rhbz#1495241 [tomcat] zip -u in spec file causes race condition