diff options
-rw-r--r-- | base/server/etc/default.cfg | 2 | ||||
-rw-r--r-- | specs/pki-core.spec | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/base/server/etc/default.cfg b/base/server/etc/default.cfg index 74e01f221..b83fb144d 100644 --- a/base/server/etc/default.cfg +++ b/base/server/etc/default.cfg @@ -216,7 +216,7 @@ pki_enable_java_debugger=False pki_enable_proxy=False pki_proxy_http_port=80 pki_proxy_https_port=443 -pki_security_manager=false +pki_security_manager=true pki_tomcat_server_port=8005 # Paths 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. |