From f895cb12141281702b34da18f2384deb64c881e7 Mon Sep 17 00:00:00 2001
From: Barry Warsaw <barry@python.org>
Date: Wed, 21 Jan 2015 17:56:53 -0500
Subject: Largely merge lp:~harlowja/cloud-init/py2-3 albeit manually because
 it seemed to be behind trunk.

`tox -e py27` passes full test suite.  Now to work on replacing mocker.
---
 packages/brpm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'packages/brpm')

diff --git a/packages/brpm b/packages/brpm
index 9657b1dd..72bfca08 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -45,6 +45,7 @@ PKG_MP = {
         'pyserial': 'pyserial',
         'pyyaml': 'PyYAML',
         'requests': 'python-requests',
+        'six': 'python-six',
     },
     'suse': {
         'argparse': 'python-argparse',
@@ -56,6 +57,7 @@ PKG_MP = {
         'pyserial': 'python-pyserial',
         'pyyaml': 'python-yaml',
         'requests': 'python-requests',
+        'six': 'python-six',
     }
 }
 
-- 
cgit v1.2.3


From 7ac709c4674e3db7ed7cc6c89765263e69d98dc0 Mon Sep 17 00:00:00 2001
From: Surojit Pathak <suro@yahoo-inc.com>
Date: Wed, 8 Apr 2015 15:21:51 +0000
Subject: Correcting the pkg-name to 'oauthlib' from 'oauth'

'make rpm' for 'redhat' distro was failing, as the requirement for
dependency was not found, otherwise.
---
 packages/brpm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/brpm')

diff --git a/packages/brpm b/packages/brpm
index 72bfca08..c6d79e75 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -40,7 +40,7 @@ PKG_MP = {
         'jinja2': 'python-jinja2',
         'configobj': 'python-configobj',
         'jsonpatch': 'python-jsonpatch',
-        'oauth': 'python-oauth',
+        'oauthlib': 'python-oauth',
         'prettytable': 'python-prettytable',
         'pyserial': 'pyserial',
         'pyyaml': 'PyYAML',
-- 
cgit v1.2.3


From eb2fe760f2b714f3d7a7a95cb9515d7691da9511 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Tue, 19 May 2015 05:16:46 -0700
Subject: packages/brpm: fix for oauth library name

brpm was broken when change from oauth to oauthlib.
---
 packages/brpm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages/brpm')

diff --git a/packages/brpm b/packages/brpm
index c6d79e75..b41b675f 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -40,7 +40,7 @@ PKG_MP = {
         'jinja2': 'python-jinja2',
         'configobj': 'python-configobj',
         'jsonpatch': 'python-jsonpatch',
-        'oauthlib': 'python-oauth',
+        'oauthlib': 'python-oauthlib',
         'prettytable': 'python-prettytable',
         'pyserial': 'pyserial',
         'pyyaml': 'PyYAML',
@@ -52,7 +52,7 @@ PKG_MP = {
         'cheetah': 'python-cheetah',
         'configobj': 'python-configobj',
         'jsonpatch': 'python-jsonpatch',
-        'oauth': 'python-oauth',
+        'oauthlib': 'python-oauthlib',
         'prettytable': 'python-prettytable',
         'pyserial': 'python-pyserial',
         'pyyaml': 'python-yaml',
-- 
cgit v1.2.3