From 3a352d83b0b8b05a744eb920003cebce68b610a7e3206b6b176e56a59758c2b1 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Thu, 24 Oct 2019 19:24:44 +0000 Subject: [PATCH] Accepting request 742558 from home:glaubitz:staging:Cloud:Tools - Update Azure CLI to latest version (boo#1154393) OBS-URL: https://build.opensuse.org/request/show/742558 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/azure-cli-core?expand=0&rev=19 --- acc_drop-compatible-releases-operator.patch | 12 ---------- acc_relax-requires-versions.patch | 14 ------------ azure-cli-core-2.0.64.tar.gz | 3 --- azure-cli-core-2.0.75.tar.gz | 3 +++ azure-cli-core.changes | 15 +++++++++++++ azure-cli-core.spec | 25 +++++++++------------ 6 files changed, 29 insertions(+), 43 deletions(-) delete mode 100644 acc_drop-compatible-releases-operator.patch delete mode 100644 acc_relax-requires-versions.patch delete mode 100644 azure-cli-core-2.0.64.tar.gz create mode 100644 azure-cli-core-2.0.75.tar.gz diff --git a/acc_drop-compatible-releases-operator.patch b/acc_drop-compatible-releases-operator.patch deleted file mode 100644 index 957bd26..0000000 --- a/acc_drop-compatible-releases-operator.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru azure-cli-core-2.0.64.orig/setup.py azure-cli-core-2.0.64/setup.py ---- azure-cli-core-2.0.64.orig/setup.py 2019-05-02 02:39:57.000000000 +0200 -+++ azure-cli-core-2.0.64/setup.py 2019-05-21 11:40:55.175850572 +0200 -@@ -59,7 +59,7 @@ - 'colorama>=0.3.9', - 'humanfriendly>=4.7', - 'jmespath', -- 'knack~=0.6.1', -+ 'knack>=0.6.1', - 'msrest>=0.4.4', - 'msrestazure>=0.4.25', - 'paramiko>=2.0.8', diff --git a/acc_relax-requires-versions.patch b/acc_relax-requires-versions.patch deleted file mode 100644 index d82bc33..0000000 --- a/acc_relax-requires-versions.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nru azure-cli-core-2.0.64.orig/setup.py azure-cli-core-2.0.64/setup.py ---- azure-cli-core-2.0.64.orig/setup.py 2019-05-21 11:42:59.840812713 +0200 -+++ azure-cli-core-2.0.64/setup.py 2019-05-21 11:43:25.317009318 +0200 -@@ -71,8 +71,8 @@ - 'requests>=2.20.0', - 'six', - 'tabulate>=0.7.7', -- 'wheel==0.30.0', -- 'azure-mgmt-resource==2.1.0', -+ 'wheel>=0.30.0', -+ 'azure-mgmt-resource>=2.1.0', - 'pyperclip>=1.7.0', - 'psutil>=5.6.1' - ] diff --git a/azure-cli-core-2.0.64.tar.gz b/azure-cli-core-2.0.64.tar.gz deleted file mode 100644 index a9f7cb2..0000000 --- a/azure-cli-core-2.0.64.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25e68a66e69da651e398d09987a0c441972cce3edb665b6e8a279b4af419b5e9 -size 106555 diff --git a/azure-cli-core-2.0.75.tar.gz b/azure-cli-core-2.0.75.tar.gz new file mode 100644 index 0000000..919ee3c --- /dev/null +++ b/azure-cli-core-2.0.75.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6fde38f4448542c0cf7b13201b702c6927180e7294221b8f67e2c834f22ae1bc +size 111902 diff --git a/azure-cli-core.changes b/azure-cli-core.changes index 5f503d8..da4c6da 100644 --- a/azure-cli-core.changes +++ b/azure-cli-core.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Oct 24 12:09:45 UTC 2019 - John Paul Adrian Glaubitz + +- New upstream release + + Version 2.0.75 + + For detailed information about changes see the + HISTORY.txt file provided with this package +- Drop patch to support older versions of setuptools as + SLE-12 is now shipping with a recent enough version + + acc_drop-compatible-releases-operator.patch +- Drop patch to relax version requires in setup.py, it's + not required as the dependencies are managed by RPM + + acc_relax-requires-versions.patch +- Update Requires from setup.py + ------------------------------------------------------------------- Tue Jun 4 09:39:29 UTC 2019 - John Paul Adrian Glaubitz diff --git a/azure-cli-core.spec b/azure-cli-core.spec index 298c283..61a04e6 100644 --- a/azure-cli-core.spec +++ b/azure-cli-core.spec @@ -17,7 +17,7 @@ Name: azure-cli-core -Version: 2.0.64 +Version: 2.0.75 Release: 0 Summary: Microsoft Azure CLI Core Module License: MIT @@ -25,8 +25,6 @@ Group: System/Management Url: https://github.com/Azure/azure-cli Source: https://files.pythonhosted.org/packages/source/a/azure-cli-core/azure-cli-core-%{version}.tar.gz Source1: LICENSE.txt -Patch1: acc_drop-compatible-releases-operator.patch -Patch2: acc_relax-requires-versions.patch BuildRequires: azure-cli-nspkg BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -36,26 +34,27 @@ Requires: azure-cli-nspkg Requires: azure-cli-telemetry Requires: python3-PyJWT Requires: python3-PyYAML -Requires: python3-adal >= 1.2.0 -Requires: python3-argcomplete >= 1.8.0 -Requires: python3-azure-mgmt-resource >= 2.1.0 +Requires: python3-adal < 2.0 +Requires: python3-adal >= 1.2 +Requires: python3-argcomplete < 2.0 +Requires: python3-argcomplete >= 1.8 +Requires: python3-azure-mgmt-resource < 5.0 +Requires: python3-azure-mgmt-resource >= 4.0 Requires: python3-azure-nspkg >= 3.0.0 Requires: python3-colorama >= 0.3.9 +Requires: python3-humanfriendly < 5.0 Requires: python3-humanfriendly >= 4.7 Requires: python3-jmespath Requires: python3-knack < 1.0.0 -Requires: python3-knack >= 0.6.1 +Requires: python3-knack >= 0.6.2 Requires: python3-msrest >= 0.4.4 -Requires: python3-msrestazure >= 0.4.25 +Requires: python3-msrestazure >= 0.6.2 +Requires: python3-paramiko < 3.0.0 Requires: python3-paramiko >= 2.0.8 Requires: python3-pip -Requires: python3-psutil >= 5.6.1 Requires: python3-pyOpenSSL >= 17.1.0 -Requires: python3-pygments -Requires: python3-pyperclip >= 1.7.0 Requires: python3-requests >= 2.20.0 Requires: python3-six -Requires: python3-tabulate >= 0.7.7 Requires: python3-wheel >= 0.30.0 %if %{python3_version_nodots} < 34 Requires: python-enum34 >= 1.0.4 @@ -69,8 +68,6 @@ Microsoft Azure CLI Core Module %prep %setup -q -n azure-cli-core-%{version} -%patch1 -p1 -%patch2 -p1 %build install -m 644 %{SOURCE1} %{_builddir}/azure-cli-core-%{version}