From 02bc4c570fe0e57b721db0b1c662a590f175585a Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Thu, 17 May 2018 13:53:33 -0400 Subject: [PATCH] Remove python-keyczar dependency (#38534) * Remove python-keyczar dependency * Remove python-keyczare from Dockerfiles * Revert "Remove python-keyczare from Dockerfiles" This reverts commit 264be66ad8337c5ccd0db76dc7000015500b6074. --- packaging/arch/PKGBUILD | 5 +---- packaging/rpm/ansible.spec | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index d9fd3440b64..70bfcd05e5d 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -16,11 +16,8 @@ pkgdesc='Ansible IT Automation' arch=('any') url='https://www.ansible.com' license=('GPL3') -depends=('python2' 'python2-paramiko' 'python2-jinja' 'python2-yaml') +depends=('python2' 'python2-paramiko' 'python2-jinja' 'python2-yaml', 'python2-crypto') makedepends=('git' 'docutils' 'fakeroot') -optdepends=('python2-pyasn1: needed for accelerated mode' - 'python2-crypto: needed for accelerated mode' - 'python2-keyczar: needed for accelerated mode') conflicts=('ansible') provides=('ansible') backup=('etc/ansible/ansible.cfg') diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index 1257de514cf..f74e07c62b0 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -26,7 +26,6 @@ BuildRequires: python26-setuptools Requires: python26-PyYAML Requires: python26-paramiko Requires: python26-jinja2 -Requires: python26-keyczar Requires: python26-httplib2 Requires: python26-setuptools Requires: python26-six @@ -60,7 +59,6 @@ BuildRequires: python-setuptools Requires: PyYAML Requires: python-paramiko Requires: python-jinja2 -Requires: python-keyczar Requires: python-httplib2 Requires: python-setuptools Requires: python-six @@ -72,7 +70,6 @@ BuildRequires: python-devel BuildRequires: python-setuptools Requires: python-paramiko Requires: python-jinja2 -Requires: python-keyczar Requires: python-yaml Requires: python-httplib2 Requires: python-setuptools