Merge "de-fuzz python-openstackclient patch"

openstack/python-openstackclient/centos/meta_patches/0008-CGTS-7947-add-os-keystone-region-name-to-identity-cl.patch

@@ -1,8 +1,7 @@
-From e407dce42d83c82407318474b1e86184d7abdfb5 Mon Sep 17 00:00:00 2001
+From bf24d1a99d29ab66feb4b2c7c7e5839e1cc23ec3 Mon Sep 17 00:00:00 2001
 From: Andy Ning <andy.ning@windriver.com>
 Date: Thu, 2 Nov 2017 10:45:40 -0400
-Subject: [PATCH 1/1] CGTS-7947: add --os-keystone-region-name to identity
- client
+Subject: CGTS-7947: add --os-keystone-region-name to identity client
 
 Signed-off-by: Andy Ning <andy.ning@windriver.com>
 ---
@@ -10,10 +9,10 @@ Signed-off-by: Andy Ning <andy.ning@windriver.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
-index 7bf7a9b..968920a 100644
+index 4791547..5d3d7b4 100644
 --- a/SPECS/python-openstackclient.spec
 +++ b/SPECS/python-openstackclient.spec
-@@ -12,6 +12,7 @@ Source0:          https://tarballs.openstack.org/%{name}/%{name}-%{upstream_vers
+@@ -21,6 +21,7 @@ Source0:          https://tarballs.openstack.org/%{name}/%{name}-%{upstream_vers
  Patch0001:        0001-neutron-extensions.patch
  Patch0002:        openstackClient_Passwordchange_warning.patch 
  Patch0003:        CGTS-7814-warning-only-when-the-admin-password-chang.patch
@@ -22,5 +21,5 @@ index 7bf7a9b..968920a 100644
  BuildArch:        noarch
  
 -- 
-1.8.3.1
+2.7.4
 

openstack/python-openstackclient/centos/meta_patches/1000-remove-version-requirements.patch

@@ -1,8 +1,8 @@
 diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
-index 4791547..1db72f9 100644
+index 5d3d7b4..44dd46b 100644
 --- a/SPECS/python-openstackclient.spec
 +++ b/SPECS/python-openstackclient.spec
-@@ -69,17 +69,17 @@ BuildRequires:    python-dateutil
+@@ -70,17 +70,17 @@ BuildRequires:    python-dateutil
  Requires:         python-pbr
  Requires:         python-babel
  Requires:         python-cliff

openstack/python-openstackclient/centos/meta_patches/1001-Turn-off-openstackclient-check.patch

@@ -1,17 +1,17 @@
-From be8dcc12e9a6719cb5031fd009bd2b587dfd33a9 Mon Sep 17 00:00:00 2001
+From 18d4d4009e230d6d0b820496d210641ab79802af Mon Sep 17 00:00:00 2001
 From: Al Bailey <Al.Bailey@windriver.com>
 Date: Thu, 19 Oct 2017 14:19:56 -0500
-Subject: [PATCH] Turn off openstackclient check
+Subject: Turn off openstackclient check
 
 ---
  SPECS/python-openstackclient.spec | 13 +++++++------
  1 file changed, 7 insertions(+), 6 deletions(-)
 
 diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
-index 1db72f9..a04299e 100644
+index 44dd46b..9bca398 100644
 --- a/SPECS/python-openstackclient.spec
 +++ b/SPECS/python-openstackclient.spec
-@@ -228,12 +228,13 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --e
+@@ -229,12 +229,13 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --e
  # Find language files
  %find_lang openstackclient --all-name
  
@@ -32,5 +32,5 @@ index 1db72f9..a04299e 100644
  %files -n python2-%{client}
  %license LICENSE
 -- 
-1.8.3.1
+2.7.4
 

openstack/python-openstackclient/centos/meta_patches/PATCH_ORDER

@@ -8,9 +8,9 @@
 0008-CGTS-7947-add-os-keystone-region-name-to-identity-cl.patch
 1000-remove-version-requirements.patch
 1001-Turn-off-openstackclient-check.patch
-0001-meta-us101470.patch
-0002-meta-us101470.patch
-0001-meta-US106901-Openstack-CLI-Adoption.patch
-0002-meta-US106901-Openstack-CLI-Adoption.patch
-1003-meta-patch-for-endpoint-groups.patch
-0016-Allow-setting-wrs-binding-vif_model-using-osclient.patch
+1002-meta-us101470.patch
+1003-meta-us101470.patch
+1004-meta-US106901-Openstack-CLI-Adoption.patch
+1005-meta-US106901-Openstack-CLI-Adoption.patch
+1006-meta-patch-for-endpoint-groups.patch
+1007-Allow-setting-wrs-binding-vif_model-using-osclient.patch