summaryrefslogtreecommitdiffstats
path: root/specs
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@redhat.com>2016-08-22 10:15:10 -0600
committerMatthew Harmsen <mharmsen@redhat.com>2016-08-22 10:15:10 -0600
commitfdd5e984874a3f6b31e0509f646785428d643ece (patch)
tree3fba11ef2cb5958482fef6c415b69edfdcc3d653 /specs
parentd08f55e6570a8e2599ab5264870c6a212add2dc5 (diff)
downloadpki-fdd5e984874a3f6b31e0509f646785428d643ece.tar.gz
pki-fdd5e984874a3f6b31e0509f646785428d643ece.tar.xz
pki-fdd5e984874a3f6b31e0509f646785428d643ece.zip
Resolve python-requests dependencies appropriately by adding minimum required
version - PKI TRAC Ticket #2431 - Errors noticed during ipa server upgrade.
Diffstat (limited to 'specs')
-rw-r--r--specs/pki-core.spec20
1 files changed, 4 insertions, 16 deletions
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index be2c12aab..015de1b1a 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -154,13 +154,8 @@ BuildRequires: python3-flake8
%endif
BuildRequires: python-nss
-BuildRequires: python-requests
+BuildRequires: python-requests >= 2.6.0
BuildRequires: python-six
-%if 0%{?rhel}
-BuildRequires: python-urllib3
-%else
-BuildRequires: python2-urllib3
-%endif
BuildRequires: libselinux-python
BuildRequires: policycoreutils-python
%if 0%{?fedora} >= 23
@@ -185,9 +180,8 @@ BuildRequires: tomcatjss >= 7.1.2-2
%if 0%{?with_python3}
BuildRequires: python3-devel
BuildRequires: python3-nss
-BuildRequires: python3-requests
+BuildRequires: python3-requests >= 2.6.0
BuildRequires: python3-six
-BuildRequires: python3-urllib3
%endif # with_python3
BuildRequires: python-devel
@@ -359,13 +353,8 @@ Obsoletes: pki-util < %{version}-%{release}
Conflicts: freeipa-server < 3.0.0
Requires: python-nss
-Requires: python-requests >= 1.1.0-3
+Requires: python-requests >= 2.6.0
Requires: python-six
-%if 0%{?rhel}
-Requires: python-urllib3
-%else
-Requires: python2-urllib3
-%endif
%description -n pki-base
The PKI Framework contains the common and client libraries and utilities
@@ -450,9 +439,8 @@ BuildArch: noarch
Requires: pki-base = %{version}-%{release}
Requires: python3-nss
-Requires: python3-requests
+Requires: python3-requests >= 2.6.0
Requires: python3-six
-Requires: python3-urllib3
%description -n pki-base-python3
This package contains PKI client library for Python 3.