From 741513502982a1929cafc8ee8303fe719abee15e708960d6f6871185e3c6f8d4 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Thu, 18 Apr 2019 01:07:05 +0000 Subject: [PATCH] Accepting request 694977 from home:glaubitz:branches:Cloud:Tools - Update Azure CLI to latest version OBS-URL: https://build.opensuse.org/request/show/694977 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/azure-cli-core?expand=0&rev=14 --- acc_relax-requires-versions.patch | 12 ++++++++++++ azure-cli-core-2.0.45.tar.gz | 3 --- azure-cli-core-2.0.58.tar.gz | 3 +++ azure-cli-core.changes | 20 ++++++++++++++++++++ azure-cli-core.spec | 24 ++++++++++++------------ 5 files changed, 47 insertions(+), 15 deletions(-) create mode 100644 acc_relax-requires-versions.patch delete mode 100644 azure-cli-core-2.0.45.tar.gz create mode 100644 azure-cli-core-2.0.58.tar.gz diff --git a/acc_relax-requires-versions.patch b/acc_relax-requires-versions.patch new file mode 100644 index 0000000..ef3a655 --- /dev/null +++ b/acc_relax-requires-versions.patch @@ -0,0 +1,12 @@ +diff -Nru azure-cli-core-2.0.58.orig/setup.py azure-cli-core-2.0.58/setup.py +--- azure-cli-core-2.0.58.orig/setup.py 2019-02-12 03:05:13.000000000 +0100 ++++ azure-cli-core-2.0.58/setup.py 2019-02-25 11:08:07.980756709 +0100 +@@ -71,7 +71,7 @@ + 'pyyaml>=4.2b1', + 'requests>=2.20.0', + 'six', +- 'tabulate>=0.7.7,<=0.8.2', ++ 'tabulate>=0.7.7', + 'wheel==0.30.0', + 'azure-mgmt-resource==2.1.0' + ] diff --git a/azure-cli-core-2.0.45.tar.gz b/azure-cli-core-2.0.45.tar.gz deleted file mode 100644 index d575daf..0000000 --- a/azure-cli-core-2.0.45.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:227b3ad08b7d138be005581835a09f0978eed1b4a8d320e733c7b228c6cac2f0 -size 81322 diff --git a/azure-cli-core-2.0.58.tar.gz b/azure-cli-core-2.0.58.tar.gz new file mode 100644 index 0000000..5caef0a --- /dev/null +++ b/azure-cli-core-2.0.58.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbd53826c77f08d8077fe1e335b55d747c95392248e518cb7179115bc6717e78 +size 95838 diff --git a/azure-cli-core.changes b/azure-cli-core.changes index cd4cfb3..f3211e9 100644 --- a/azure-cli-core.changes +++ b/azure-cli-core.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Apr 16 14:08:23 UTC 2019 - John Paul Adrian Glaubitz + +- New upstream release + + Version 2.0.58 + + For detailed information about changes see the + HISTORY.txt file provided with this package +- Bump minimum version for Python Azure SDK namespace + packages to 3.0.0 in BuildRequires and Requires +- Relax upper version for python-tabulate build dependency (boo#1125671) + + Cherry-pick fix from upstream to patch setup.py + * acc_relax-requires-versions.patch + + Remove upper version constraint in BuildRequires for python-tabulate +- Remove python3-devel package from BuildRequires +- Remove unzip package from BuildRequires +- Run fdupes to hardlink duplicate files + + Add fdupes to BuildRequires + + Add %fdupes invocation to %install +- Update Requires from setup.py + ------------------------------------------------------------------- Sun Mar 3 21:11:56 UTC 2019 - Robert Schweikert diff --git a/azure-cli-core.spec b/azure-cli-core.spec index 0a82870..44893dc 100644 --- a/azure-cli-core.spec +++ b/azure-cli-core.spec @@ -17,7 +17,7 @@ Name: azure-cli-core -Version: 2.0.45 +Version: 2.0.58 Release: 0 Summary: Microsoft Azure CLI Core Module License: MIT @@ -25,33 +25,31 @@ 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 +Patch: acc_relax-requires-versions.patch BuildRequires: azure-cli-nspkg -BuildRequires: python3-azure-nspkg -BuildRequires: python3-devel +BuildRequires: fdupes +BuildRequires: python3-azure-nspkg >= 3.0.0 BuildRequires: python3-setuptools -BuildRequires: unzip Requires: azure-cli-nspkg Requires: azure-cli-telemetry Requires: python3-PyJWT -Requires: python3-PyYAML < 4.0.0 -Requires: python3-PyYAML >= 3.13 -Requires: python3-adal >= 1.0.2 +Requires: python3-PyYAML >= 4.2b1 +Requires: python3-adal >= 1.2.0 Requires: python3-argcomplete >= 1.8.0 -Requires: python3-azure-mgmt-resource >= 2.0.0 -Requires: python3-azure-nspkg +Requires: python3-azure-mgmt-resource >= 2.1.0 +Requires: python3-azure-nspkg >= 3.0.0 Requires: python3-colorama >= 0.3.9 Requires: python3-humanfriendly >= 4.7 Requires: python3-jmespath -Requires: python3-knack >= 0.4.2 +Requires: python3-knack >= 0.5.1 Requires: python3-msrest >= 0.4.4 Requires: python3-msrestazure >= 0.4.25 Requires: python3-paramiko >= 2.0.8 Requires: python3-pip Requires: python3-pyOpenSSL >= 17.1.0 Requires: python3-pygments -Requires: python3-requests +Requires: python3-requests >= 2.20.0 Requires: python3-six -Requires: python3-tabulate <= 0.9.0 Requires: python3-tabulate >= 0.7.7 Requires: python3-wheel >= 0.30.0 %if %{python3_version_nodots} < 34 @@ -66,6 +64,7 @@ Microsoft Azure CLI Core Module %prep %setup -q -n azure-cli-core-%{version} +%patch -p1 %build install -m 644 %{SOURCE1} %{_builddir}/azure-cli-core-%{version} @@ -73,6 +72,7 @@ python3 setup.py build %install python3 setup.py install --root=%{buildroot} --prefix=%{_prefix} --install-lib=%{python3_sitelib} +%python_expand %fdupes %{buildroot}%{$python_sitelib} rm -rf %{buildroot}%{python3_sitelib}/azure/cli/__init__.* rm -rf %{buildroot}%{python3_sitelib}/azure/cli/__pycache__ rm -rf %{buildroot}%{python3_sitelib}/azure/__init__.*