Merge "Clear out some duplicate package dependencies"

2015-11-10 14:53:39 +00:00 · 2015-11-10 14:53:39 +00:00 · ef0d320981
commit ef0d320981
parent 5c9e6e28be a5e4c0f279
11 changed files with 2 additions and 23 deletions
--- a/files/debs/ceilometer-collector
+++ b/files/debs/ceilometer-collector
@ -1,6 +1,3 @@
 python-pymongo #NOPRIME
 mongodb-server #NOPRIME
 libnspr4-dev
-pkg-config
-libxml2-dev
-libxslt-dev
--- a/files/debs/general
+++ b/files/debs/general
@ -29,3 +29,4 @@ openjdk-7-jre-headless  # NOPRIME
 pkg-config
 libmysqlclient-dev  # MySQL-python
 libpq-dev  # psycopg2
+zlib1g-dev
--- a/files/debs/glance
+++ b/files/debs/glance
@ -1,6 +0,0 @@
-libmysqlclient-dev
-libpq-dev
-libssl-dev
-libxml2-dev
-libxslt1-dev
-zlib1g-dev
--- a/files/debs/nova
+++ b/files/debs/nova
@ -8,8 +8,6 @@ libmysqlclient-dev
 mysql-server # NOPRIME
 python-mysqldb
 python-mysql.connector
-libxml2-dev # needed for building lxml
-libxslt1-dev
 gawk
 iptables
 ebtables
--- a/files/debs/tempest
+++ b/files/debs/tempest
@ -1,2 +0,0 @@
-libxml2-dev
-libxslt1-dev
--- a/files/debs/trove
+++ b/files/debs/trove
@ -1 +0,0 @@
-libxslt1-dev
--- a/files/rpms/general
+++ b/files/rpms/general
@ -32,3 +32,4 @@ iptables-services  # NOPRIME f21,f22
 mariadb-devel  # MySQL-python
 postgresql-devel  # psycopg2
 redhat-rpm-config # MySQL-python rhbz-1195207 f21
+zlib-devel
--- a/files/rpms/glance
+++ b/files/rpms/glance
@ -1,6 +0,0 @@
-libxml2-devel
-libxslt-devel
-mysql-devel
-openssl-devel
-postgresql-devel
-zlib-devel
--- a/files/rpms/keystone
+++ b/files/rpms/keystone
@ -1,4 +1,3 @@
 MySQL-python
-libxslt-devel
 sqlite
 mod_ssl
--- a/files/rpms/tempest
+++ b/files/rpms/tempest
@ -1 +0,0 @@
-libxslt-devel
--- a/files/rpms/trove
+++ b/files/rpms/trove
@ -1 +0,0 @@
-libxslt-devel