diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2015-08-07 18:38:09 -0600 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2015-08-08 07:19:25 +0200 |
| commit | 52547567fee5e32b58e69c017546cc20f87fbef9 (patch) | |
| tree | 7a6679c129488f5d4b54ceb90d61293dc1f77fe0 /specs | |
| parent | a6423245a01217a295091407dfcb8fe79e019342 (diff) | |
| download | pki-52547567fee5e32b58e69c017546cc20f87fbef9.tar.gz pki-52547567fee5e32b58e69c017546cc20f87fbef9.tar.xz pki-52547567fee5e32b58e69c017546cc20f87fbef9.zip | |
updated dependencies
- PKI TRAC Ticket #1530 - Client pki-tools missing tomcat-servlet dependency
- PKI TRAC Ticket #1542 - Update tomcatjss dependency on Fedora 23 and later
Diffstat (limited to 'specs')
| -rw-r--r-- | specs/pki-core.spec | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 8e482357f..6ac89df38 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -40,7 +40,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: pki-core Version: 10.2.7 -Release: 0.2%{?dist} +Release: 0.3%{?dist} Summary: Certificate System - PKI Core Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -121,8 +121,12 @@ BuildRequires: systemd-units %if 0%{?rhel} BuildRequires: tomcatjss >= 7.1.0-6 %else +%if 0%{?fedora} >= 23 +BuildRequires: tomcatjss >= 7.1.3 +%else BuildRequires: tomcatjss >= 7.1.2 %endif +%endif # additional build requirements needed to build native 'tpsclient' @@ -336,6 +340,13 @@ Requires: nss-tools Requires: java-headless >= 1:1.7.0 Requires: pki-base = %{version}-%{release} Requires: jpackage-utils >= 0:1.7.5-10 +%if 0%{?fedora} >= 23 +Requires: tomcat-servlet-3.1-api +%else +%if 0%{?fedora} >= 22 +Requires: tomcat-servlet-3.0-api +%endif +%endif %description -n pki-tools This package contains PKI executables that can be used to help make @@ -410,9 +421,13 @@ Requires(postun): systemd-units Requires(pre): shadow-utils %if 0%{?rhel} -Requires: tomcatjss >= 7.1.0-6 +Requires: tomcatjss >= 7.1.0-6 %else -Requires: tomcatjss >= 7.1.2 +%if 0%{?fedora} >= 23 +Requires: tomcatjss >= 7.1.3 +%else +Requires: tomcatjss >= 7.1.2 +%endif %endif %description -n pki-server @@ -987,6 +1002,11 @@ systemctl daemon-reload %endif # %{with server} %changelog +* Fri Aug 7 2015 Dogtag Team <pki-devel@redhat.com> 10.2.7-0.3 +- Added dep on tomcat-servlet-3.1-api [Fedora 23 and later] or dep on + tomcat-servlet-3.0-api [Fedora 22 and later] to pki-tools +- Updated dep on tomcatjss [Fedora 23 and later] + * Fri Jul 24 2015 Tomas Radej <tradej@redhat.com> - 10.2.7-0.2 - Updated dep on policycoreutils-python-utils [Fedora 23 and later] |