summaryrefslogtreecommitdiffstats
path: root/specs
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2013-11-07 13:39:01 -0500
committerAde Lee <alee@redhat.com>2013-11-07 15:45:41 -0500
commit252848b5f62f1615bd695c38b970663f88d5500b (patch)
treec98cbe355e3b21e42a22158269948cee51f67a07 /specs
parent66eabd97adafa95f97215202a825d73f5fca7692 (diff)
downloadpki-252848b5f62f1615bd695c38b970663f88d5500b.tar.gz
pki-252848b5f62f1615bd695c38b970663f88d5500b.tar.xz
pki-252848b5f62f1615bd695c38b970663f88d5500b.zip
Revert to allowing security manager
Bug in tomcat for security manager has been resolved. Updated tomcat requirement accordingly. Ticket 774
Diffstat (limited to 'specs')
-rw-r--r--specs/pki-core.spec12
1 files changed, 10 insertions, 2 deletions
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 1d6002ae1..d42e1d4ea 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -5,7 +5,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: pki-core
Version: 10.1.0
-Release: 0.12%{?dist}
+Release: 0.13%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -292,6 +292,11 @@ Requires: pki-selinux = %{version}-%{release}
%else
Requires: selinux-policy-base >= 3.11.1-43
Obsoletes: pki-selinux
+%endif
+
+%if 0%{?fedora} >= 20
+Requires: tomcat >= 7.0.47
+%else
Requires: tomcat >= 7.0.27
%endif
@@ -299,7 +304,7 @@ Requires: velocity
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
-Requires: tomcat >= 7.0.27
+
%if 0%{?rhel} || 0%{?fedora} >= 19
Requires: tomcatjss >= 7.1.0
%endif
@@ -1066,6 +1071,9 @@ fi
%changelog
+* Thu Nov 7 2013 Ade Lee <alee@redhat.com> 10.1.0-0.13
+- Updated requirements for tomcat
+
* Fri Oct 4 2013 Ade Lee <alee@redhat.com> 10.1.0-0.12
- Removed additional /var/run, /var/lock references.