Merge "Promote libffi-dev as a general dependency"

2014-07-22 14:38:24 +00:00 · 2014-07-22 14:38:24 +00:00 · 2bb05fdb84
commit 2bb05fdb84
parent 89a8a15ebe 87d74a0bdd
6 changed files with 2 additions and 4 deletions
--- a/files/apts/general
+++ b/files/apts/general
@ -24,3 +24,4 @@ python-mock # testonly
 python2.7
 bc
 libyaml-dev
+libffi-dev
--- a/files/apts/glance
+++ b/files/apts/glance
@ -1,4 +1,3 @@
-libffi-dev
 libmysqlclient-dev  # testonly
 libpq-dev           # testonly
 libssl-dev          # testonly
--- a/files/apts/swift
+++ b/files/apts/swift
@ -1,5 +1,4 @@
 curl
-libffi-dev
 memcached
 python-configobj
 python-coverage
--- a/files/rpms/general
+++ b/files/rpms/general
@ -7,6 +7,7 @@ git-core
 openssh-server
 openssl
 openssl-devel # to rebuild pyOpenSSL if needed
+libffi-devel
 libxml2-devel
 libxslt-devel
 psmisc
--- a/files/rpms/glance
+++ b/files/rpms/glance
@ -1,4 +1,3 @@
-libffi-devel
 libxml2-devel       # testonly
 libxslt-devel       # testonly
 mysql-devel         # testonly
--- a/files/rpms/swift
+++ b/files/rpms/swift
@ -1,5 +1,4 @@
 curl
-libffi-devel
 memcached
 python-configobj
 python-coverage