From 9dc1c1705898d9630f0964446c3ef16f4934971f Mon Sep 17 00:00:00 2001 From: jfwood Date: Wed, 8 Jan 2014 08:59:20 -0600 Subject: [PATCH] Remove lingering celery dependencies out of RPM dependencies. There were two celery-related dependencies still lurking in the RPM dependencies file after the move to oslo.messaging. This commit removes the last of those. Change-Id: I5f2c6851cc1d97f6c6defc408b622907a6fe0322 --- debian/control | 1 - rpmbuild/SPECS/barbican.spec | 2 +- rpmbuild/package_dependencies.sh | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/debian/control b/debian/control index 25eef581f..1bb6c1eb3 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,6 @@ Package: barbican-common Architecture: amd64 Section: python Depends: ${python:Depends}, ${misc:Depends}, - python-celery, python-crypto, python-dateutil, python-eventlet, diff --git a/rpmbuild/SPECS/barbican.spec b/rpmbuild/SPECS/barbican.spec index 9c48bef3f..1b33233dd 100644 --- a/rpmbuild/SPECS/barbican.spec +++ b/rpmbuild/SPECS/barbican.spec @@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/barbican-%{version}-%{release}-buildroot BuildArch: noarch BuildRequires: python2-devel Requires(pre): shadow-utils -Requires: python-alembic, python-celery, python-crypto, python-dateutil +Requires: python-alembic, python-crypto, python-dateutil Requires: python-eventlet, python-falcon, python-iso8601, python-jsonschema Requires: python-keystoneclient, python-kombu, python-oslo.config, python-paste-deploy Requires: python-psycopg2, python-pysqlite, python-sqlalchemy, python-stevedore diff --git a/rpmbuild/package_dependencies.sh b/rpmbuild/package_dependencies.sh index aca46454e..be2330c71 100755 --- a/rpmbuild/package_dependencies.sh +++ b/rpmbuild/package_dependencies.sh @@ -18,7 +18,6 @@ fpm -s python -t rpm webob # --> # python-webob.noarch 0.9.6.1-3.el6 exists, but is incompatible # fpm -s python -t rpm PasteDeploy # --> python-paste-deploy 1.3.3-2.1.el6 -fpm -s python -t rpm Celery fpm -s python -t rpm python-keystoneclient fpm -s python -t rpm stevedore fpm -s python -t rpm -n python-crypto pycrypto @@ -48,9 +47,6 @@ fpm -s python -t rpm mako # fpm -s python -t rpm markupsafe fpm -s python -t rpm argparse -# python-celery -fpm -s python -t rpm -v 2.7.3.34 billiard - # python-eventlet fpm -s python -t rpm greenlet