From 3f80b6ccb159b02b542f6087cac39f4d6cab0dae Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Wed, 5 Sep 2018 14:04:38 -0400 Subject: [PATCH] Remove python-keyczar dependency (#38534) (#44321) (cherry picked from commit 02bc4c570fe0e57b721db0b1c662a590f175585a) --- packaging/arch/PKGBUILD | 7 ++----- packaging/rpm/ansible.spec | 3 --- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index ec7d9272f1..70bfcd05e5 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') -makedepends=('git' 'asciidoc' 'fakeroot') -optdepends=('python2-pyasn1: needed for accelerated mode' - 'python2-crypto: needed for accelerated mode' - 'python2-keyczar: needed for accelerated mode') +depends=('python2' 'python2-paramiko' 'python2-jinja' 'python2-yaml', 'python2-crypto') +makedepends=('git' 'docutils' 'fakeroot') conflicts=('ansible') provides=('ansible') backup=('etc/ansible/ansible.cfg') diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec index ba022cf85e..6598480ea3 100644 --- a/packaging/rpm/ansible.spec +++ b/packaging/rpm/ansible.spec @@ -25,7 +25,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 @@ -59,7 +58,6 @@ BuildRequires: python-setuptools Requires: PyYAML Requires: python-paramiko Requires: python-jinja2 -Requires: python-keyczar Requires: python-httplib2 Requires: python-setuptools Requires: python-six @@ -71,7 +69,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