diff options
| author | Ade Lee <alee@redhat.com> | 2014-10-01 23:00:12 -0400 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2014-10-01 23:00:12 -0400 |
| commit | b46a179a2bae8cc2d1415349841a93de32ad8938 (patch) | |
| tree | 97b4cb82282af0e38dc3340960d3c9f3ef42775e /specs | |
| parent | 9fb0853e40eea008ff96bb0061c169ace4087ce7 (diff) | |
| download | pki-b46a179a2bae8cc2d1415349841a93de32ad8938.tar.gz pki-b46a179a2bae8cc2d1415349841a93de32ad8938.tar.xz pki-b46a179a2bae8cc2d1415349841a93de32ad8938.zip | |
Fixes to spec file for RHEL build
Diffstat (limited to 'specs')
| -rw-r--r-- | specs/pki-core.spec | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 55f603fd6..89474725b 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -27,6 +27,7 @@ BuildRequires: ldapjdk BuildRequires: apache-commons-cli BuildRequires: apache-commons-codec BuildRequires: apache-commons-io +BuildRequires: jakarta-commons-httpclient BuildRequires: nspr-devel BuildRequires: nss-devel >= 3.14.3 BuildRequires: openldap-devel @@ -41,6 +42,7 @@ BuildRequires: xerces-j2 # 'resteasy' packages and consists of what is needed to # support the PKI Restful interface on RHEL platforms BuildRequires: resteasy-base-atom-provider >= 3.0.6-1 +BuildRequires: resteasy-base-client >= 3.0.6-1 BuildRequires: resteasy-base-jaxb-provider >= 3.0.6-1 BuildRequires: resteasy-base-jaxrs >= 3.0.6-1 BuildRequires: resteasy-base-jaxrs-api >= 3.0.6-1 @@ -209,6 +211,7 @@ Requires: apache-commons-codec Requires: apache-commons-io Requires: apache-commons-lang Requires: apache-commons-logging +Requires: jakarta-commons-httpclient Requires: java-headless >= 1:1.7.0 Requires: javassist Requires: jackson-jaxrs-json-provider @@ -223,6 +226,7 @@ Requires: python-requests >= 1.1.0-3 # 'resteasy' packages and consists of what is needed to # support the PKI Restful interface on RHEL platforms Requires: resteasy-base-atom-provider >= 3.0.6-1 +Requires: resteasy-base-client >= 3.0.6-1 Requires: resteasy-base-jaxb-provider >= 3.0.6-1 Requires: resteasy-base-jaxrs >= 3.0.6-1 Requires: resteasy-base-jaxrs-api >= 3.0.6-1 @@ -298,7 +302,11 @@ Requires: policycoreutils-python Requires: selinux-policy-base >= 3.11.1-43 Obsoletes: pki-selinux +%if 0%{?rhel} +Requires: tomcat >= 7.0.54 +%else Requires: tomcat >= 7.0.47 +%endif Requires: velocity Requires(post): systemd-units @@ -844,6 +852,9 @@ echo >> /var/log/pki/pki-server-upgrade-%{version}.log 2>&1 %changelog * Wed Oct 1 2014 Ade Lee <alee@redhat.com> 10.2.0-3 - Disable pylint dependency for RHEL builds +- Added jakarta-commons-httpclient requirements +- Added tomcat version for RHEL build +- Added resteasy-base-client for RHEL build * Wed Sep 24 2014 Matthew Harmsen <mharmsen@redhat.com> - 10.2.0-2 - PKI TRAC Ticket #1130 - Add RHEL/CentOS conditionals to spec |