From d17fdac856510ba078d1ae12f23ccf7f3b9f33a4a995eec15646c6a27faba335 Mon Sep 17 00:00:00 2001
From: Robert Schweikert <rjschwei@suse.com>
Date: Wed, 27 May 2015 22:33:00 +0000
Subject: [PATCH] - use the patch, duh

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-cli?expand=0&rev=10
---
 aws-cli.spec           |  4 ++--
 hide_py_pckgmgmt.patch | 26 ++++++++++++--------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/aws-cli.spec b/aws-cli.spec
index eb93dae..e8bb418 100644
--- a/aws-cli.spec
+++ b/aws-cli.spec
@@ -24,7 +24,7 @@ License:        Apache-2.0
 Group:          System/Management
 Url:            https://github.com/aws/aws-cli
 Source0:        %{name}-%{version}.tar.gz
-#Patch0:         hide_py_pckgmgmt.patch
+Patch0:         hide_py_pckgmgmt.patch
 Requires:       python
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
 Requires:       python-argparse >= 1.1
@@ -52,7 +52,7 @@ The AWS Command Line Interface (CLI) is a unified tool to manage your AWS servic
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0
 
 %build
 python setup.py build
diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch
index 6214a8a..289afe0 100644
--- a/hide_py_pckgmgmt.patch
+++ b/hide_py_pckgmgmt.patch
@@ -1,21 +1,19 @@
-Index: aws-cli-1.2.13/setup.py
-===================================================================
---- aws-cli-1.2.13.orig/setup.py
-+++ aws-cli-1.2.13/setup.py
+--- setup.py.orig
++++ setup.py
 @@ -6,16 +6,16 @@ from setuptools import setup, find_packa
  import awscli
  
  
--requires = ['botocore>=0.82.0,<0.83.0',
--            'bcdoc>=0.12.0,<0.13.0',
--            'colorama==0.2.5',
+-requires = ['botocore==1.0.0a1',
+-            'bcdoc>=0.14.0,<0.15.0',
+-            'colorama>=0.2.5,<=0.3.3',
 -            'docutils>=0.10',
--            'rsa==3.1.2']
-+#requires = ['botocore>=0.82.0,<0.83.0',
-+#            'bcdoc>=0.12.0,<0.13.0',
-+#            'colorama==0.2.5',
+-            'rsa>=3.1.2,<=3.1.4']
++#requires = ['botocore==1.0.0a1',
++#            'bcdoc>=0.14.0,<0.15.0',
++#            'colorama>=0.2.5,<=0.3.3',
 +#            'docutils>=0.10',
-+#            'rsa==3.1.2']
++#            'rsa>=3.1.2,<=3.1.4']
  
 -if sys.version_info[:2] == (2, 6):
 -    # For python2.6 we have to require argparse since it
@@ -29,9 +27,9 @@ Index: aws-cli-1.2.13/setup.py
  
  setup_options = dict(
 @@ -33,7 +33,7 @@ setup_options = dict(
-     package_dir={'awscli': 'awscli'},
      package_data={'awscli': ['data/*.json', 'examples/*/*.rst',
-                              'examples/*/*/*.rst']},
+                              'examples/*/*/*.rst', 'topics/*.rst',
+                              'topics/*.json']},
 -    install_requires=requires,
 +#    install_requires=requires,
      license="Apache License 2.0",