From d7f7cb275cf0dd78a1490a056685b6753591d14f Mon Sep 17 00:00:00 2001
From: Sergey Skripnick <sskripnick@mirantis.com>
Date: Fri, 14 Mar 2014 14:13:16 +0200
Subject: [PATCH] Add python-dev to general requirements

Package python-openstackclient depends on pycrypto, and pycrypto depends
on python-dev. Since python-openstackclient should be installed in any
case, python-dev should be in general requirements.

Change-Id: I2d6f5919bdc1175252c78cd203a8769d3892b923
Closes: bug 1292477
---
 files/apts/cinder   | 1 -
 files/apts/general  | 1 +
 files/apts/glance   | 1 -
 files/apts/keystone | 1 -
 files/apts/swift    | 1 -
 files/rpms/cinder   | 1 -
 files/rpms/general  | 1 +
 files/rpms/glance   | 1 -
 files/rpms/swift    | 1 -
 9 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/files/apts/cinder b/files/apts/cinder
index 712fee99ec..7819c31655 100644
--- a/files/apts/cinder
+++ b/files/apts/cinder
@@ -2,6 +2,5 @@ tgt
 lvm2
 qemu-utils
 libpq-dev
-python-dev
 open-iscsi
 open-iscsi-utils # Deprecated since quantal dist:precise
diff --git a/files/apts/general b/files/apts/general
index 995c0c6f88..020d84fe84 100644
--- a/files/apts/general
+++ b/files/apts/general
@@ -18,5 +18,6 @@ tcpdump
 euca2ools # only for testing client
 tar
 python-cmd2 # dist:precise
+python-dev
 python2.7
 bc
diff --git a/files/apts/glance b/files/apts/glance
index 6dc878e4de..e80f447a16 100644
--- a/files/apts/glance
+++ b/files/apts/glance
@@ -5,7 +5,6 @@ libpq-dev           # testonly
 libssl-dev          # testonly
 libxml2-dev
 libxslt1-dev        # testonly
-python-dev
 python-eventlet
 python-routes
 python-greenlet
diff --git a/files/apts/keystone b/files/apts/keystone
index 564921b78b..57fde80aea 100644
--- a/files/apts/keystone
+++ b/files/apts/keystone
@@ -1,4 +1,3 @@
-python-dev
 python-lxml
 python-pastescript
 python-pastedeploy
diff --git a/files/apts/swift b/files/apts/swift
index 37d5bc049e..0c27b5b982 100644
--- a/files/apts/swift
+++ b/files/apts/swift
@@ -4,7 +4,6 @@ libffi-dev
 memcached
 python-configobj
 python-coverage
-python-dev
 python-eventlet
 python-greenlet
 python-netifaces
diff --git a/files/rpms/cinder b/files/rpms/cinder
index 423d57cd98..ce6181eedf 100644
--- a/files/rpms/cinder
+++ b/files/rpms/cinder
@@ -1,7 +1,6 @@
 lvm2
 scsi-target-utils
 qemu-img
-python-devel
 postgresql-devel
 iscsi-initiator-utils
 python-lxml         #dist:f19,f20,rhel7
diff --git a/files/rpms/general b/files/rpms/general
index 6cfe31eaf1..99be725d88 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -15,6 +15,7 @@ python-setuptools
 python-prettytable # dist:rhel6 [1]
 python-unittest2
 python-virtualenv
+python-devel
 screen
 tar
 tcpdump
diff --git a/files/rpms/glance b/files/rpms/glance
index 2007e2ea9e..f959c224d8 100644
--- a/files/rpms/glance
+++ b/files/rpms/glance
@@ -6,7 +6,6 @@ mysql-devel         # testonly
 openssl-devel       # testonly
 postgresql-devel    # testonly
 python-argparse
-python-devel
 python-eventlet
 python-greenlet
 python-lxml         #dist:f19,f20,rhel7
diff --git a/files/rpms/swift b/files/rpms/swift
index bf29ea29b7..ec53424ada 100644
--- a/files/rpms/swift
+++ b/files/rpms/swift
@@ -4,7 +4,6 @@ libffi-devel
 memcached
 python-configobj
 python-coverage
-python-devel
 python-eventlet
 python-greenlet
 python-netifaces