diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2015-04-16 12:59:26 -0400 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2015-04-20 17:53:59 -0400 |
| commit | 16e4a5cc0133533afe1a04711cc671466170e01a (patch) | |
| tree | b9da7212ae3c34e97f182ef52896ec07a49e5c6b /specs | |
| parent | 3c24fc75d3c35ae5222a8cd0b5e1917c3a4dbd59 (diff) | |
| download | pki-16e4a5cc0133533afe1a04711cc671466170e01a.tar.gz pki-16e4a5cc0133533afe1a04711cc671466170e01a.tar.xz pki-16e4a5cc0133533afe1a04711cc671466170e01a.zip | |
Fixed problem upgrading to F22.
Due to possible Tomcat 7 and 8 conflicts on F22 the spec file has
been modified to explicitly require the proper Tomcat packages for
the platform.
https://fedorahosted.org/pki/ticket/1332
Diffstat (limited to 'specs')
| -rw-r--r-- | specs/pki-core.spec | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 6ac4d0180..5117695a1 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -345,6 +345,15 @@ Obsoletes: pki-selinux Requires: tomcat >= 7.0.54 %else Requires: tomcat >= 7.0.47 +%if 0%{?fedora} >= 23 +Requires: tomcat-el-3.0-api +Requires: tomcat-jsp-2.3-api +Requires: tomcat-servlet-3.1-api +%else +Requires: tomcat-el-2.2-api +Requires: tomcat-jsp-2.2-api +Requires: tomcat-servlet-3.0-api +%endif %endif Requires: velocity |