From a7e0b39a64f53f77f970c90d17f621be74f95215 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 9 Nov 2015 12:02:51 +1100
Subject: [PATCH] Move devlib packages into "general"

The removal of the wheel caching code
(Ia140dc34638d893b92f66d1ba20efd9522c5923b) removed the install of the
"devlib" packages, which was being done with a call in
tools/build_wheels.sh

The idea of "devlibs" and "general" seems to be pretty much the same
thing -- global build requirements.  I have removed the unused devlibs
files, and moved any missing packages into the "general" package
install file.

Change-Id: I8f34a164d6785a122394b42387d4221a7b447ae1
---
 files/debs/devlibs      | 7 -------
 files/debs/general      | 2 ++
 files/rpms-suse/devlibs | 6 ------
 files/rpms-suse/general | 5 +++++
 files/rpms/devlibs      | 8 --------
 files/rpms/general      | 7 +++++--
 6 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 files/debs/devlibs
 delete mode 100644 files/rpms-suse/devlibs
 delete mode 100644 files/rpms/devlibs

diff --git a/files/debs/devlibs b/files/debs/devlibs
deleted file mode 100644
index 0446ceb6b6..0000000000
--- a/files/debs/devlibs
+++ /dev/null
@@ -1,7 +0,0 @@
-libffi-dev  # pyOpenSSL
-libmysqlclient-dev  # MySQL-python
-libpq-dev  # psycopg2
-libssl-dev  # pyOpenSSL
-libxml2-dev  # lxml
-libxslt1-dev  # lxml
-python-dev  # pyOpenSSL
diff --git a/files/debs/general b/files/debs/general
index 80e81f5841..7bc90a6864 100644
--- a/files/debs/general
+++ b/files/debs/general
@@ -27,3 +27,5 @@ libxslt1-dev  # lxml
 gettext  # used for compiling message catalogs
 openjdk-7-jre-headless  # NOPRIME
 pkg-config
+libmysqlclient-dev  # MySQL-python
+libpq-dev  # psycopg2
diff --git a/files/rpms-suse/devlibs b/files/rpms-suse/devlibs
deleted file mode 100644
index 54d13a33e9..0000000000
--- a/files/rpms-suse/devlibs
+++ /dev/null
@@ -1,6 +0,0 @@
-libffi-devel  # pyOpenSSL
-libopenssl-devel  # pyOpenSSL
-libxslt-devel  # lxml
-postgresql-devel  # psycopg2
-libmysqlclient-devel # MySQL-python
-python-devel  # pyOpenSSL
diff --git a/files/rpms-suse/general b/files/rpms-suse/general
index 42756d8fcc..3a7c4b56fd 100644
--- a/files/rpms-suse/general
+++ b/files/rpms-suse/general
@@ -21,3 +21,8 @@ tcpdump
 unzip
 wget
 net-tools
+libffi-devel  # pyOpenSSL
+libxslt-devel  # lxml
+postgresql-devel  # psycopg2
+libmysqlclient-devel # MySQL-python
+python-devel  # pyOpenSSL
diff --git a/files/rpms/devlibs b/files/rpms/devlibs
deleted file mode 100644
index 385ed3b84c..0000000000
--- a/files/rpms/devlibs
+++ /dev/null
@@ -1,8 +0,0 @@
-libffi-devel  # pyOpenSSL
-libxml2-devel  # lxml
-libxslt-devel  # lxml
-mariadb-devel  # MySQL-python
-openssl-devel  # pyOpenSSL
-postgresql-devel  # psycopg2
-python-devel  # pyOpenSSL
-redhat-rpm-config # MySQL-python rhbz-1195207 f21
diff --git a/files/rpms/general b/files/rpms/general
index c3f3de893a..2a45227e0f 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -10,8 +10,8 @@ openssh-server
 openssl
 openssl-devel # to rebuild pyOpenSSL if needed
 libffi-devel
-libxml2-devel
-libxslt-devel
+libxml2-devel # lxml
+libxslt-devel # lxml
 pkgconfig
 psmisc
 python-devel
@@ -29,3 +29,6 @@ java-1.7.0-openjdk-headless  # NOPRIME rhel7
 java-1.8.0-openjdk-headless  # NOPRIME f21,f22
 pyOpenSSL # version in pip uses too much memory
 iptables-services  # NOPRIME f21,f22
+mariadb-devel  # MySQL-python
+postgresql-devel  # psycopg2
+redhat-rpm-config # MySQL-python rhbz-1195207 f21