diff --git a/amc_drop-compatible-releases-operator.patch b/amc_drop-compatible-releases-operator.patch index e841a21..80e32ee 100644 --- a/amc_drop-compatible-releases-operator.patch +++ b/amc_drop-compatible-releases-operator.patch @@ -1,12 +1,12 @@ -diff -Nru azure-mgmt-containerregistry-2.1.0.orig/setup.py azure-mgmt-containerregistry-2.1.0/setup.py ---- azure-mgmt-containerregistry-2.1.0.orig/setup.py 2018-07-26 20:25:48.000000000 +0200 -+++ azure-mgmt-containerregistry-2.1.0/setup.py 2018-09-03 16:50:49.626545660 +0200 -@@ -80,7 +80,7 @@ +diff -Nru azure-mgmt-containerregistry-2.7.0.orig/setup.py azure-mgmt-containerregistry-2.7.0/setup.py +--- azure-mgmt-containerregistry-2.7.0.orig/setup.py 2019-02-01 22:36:14.000000000 +0100 ++++ azure-mgmt-containerregistry-2.7.0/setup.py 2019-03-25 14:37:03.009634686 +0100 +@@ -79,7 +79,7 @@ install_requires=[ 'msrest>=0.5.0', 'msrestazure>=0.4.32,<2.0.0', -- 'azure-common~=1.1,>=1.1.10', -+ 'azure-common>=1.1.10,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1', ], - cmdclass=cmdclass - ) + extras_require={ + ":python_version<'3.0'": ['azure-mgmt-nspkg'], diff --git a/amc_drop-extras-require.patch b/amc_drop-extras-require.patch new file mode 100644 index 0000000..9bb4d11 --- /dev/null +++ b/amc_drop-extras-require.patch @@ -0,0 +1,11 @@ +diff -Nru azure-mgmt-containerregistry-2.7.0.orig/setup.py azure-mgmt-containerregistry-2.7.0/setup.py +--- azure-mgmt-containerregistry-2.7.0.orig/setup.py 2019-04-11 15:19:12.073971823 +0200 ++++ azure-mgmt-containerregistry-2.7.0/setup.py 2019-04-11 15:19:27.666117442 +0200 +@@ -81,7 +81,4 @@ + 'msrestazure>=0.4.32,<2.0.0', + 'azure-common>=1.1', + ], +- extras_require={ +- ":python_version<'3.0'": ['azure-mgmt-nspkg'], +- } + ) diff --git a/azure-mgmt-containerregistry-2.1.0.zip b/azure-mgmt-containerregistry-2.1.0.zip deleted file mode 100644 index 7d933a3..0000000 --- a/azure-mgmt-containerregistry-2.1.0.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4624bdaae57b5e107264f286931d0d81f942d0c57b0d93e8a2432abf9b074d7d -size 312490 diff --git a/azure-mgmt-containerregistry-2.7.0.zip b/azure-mgmt-containerregistry-2.7.0.zip new file mode 100644 index 0000000..e77faf9 --- /dev/null +++ b/azure-mgmt-containerregistry-2.7.0.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eef8a747ffb43abeb034419a81091fe3fed24ea6a2beab58f3b6933bb0cf0310 +size 536647 diff --git a/python-azure-mgmt-containerregistry.changes b/python-azure-mgmt-containerregistry.changes index 64b0172..febdfb9 100644 --- a/python-azure-mgmt-containerregistry.changes +++ b/python-azure-mgmt-containerregistry.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Apr 11 13:22:37 UTC 2019 - John Paul Adrian Glaubitz + +- New upstream release + + Version 2.7.0 + + For detailed information about changes see the + HISTORY.txt file provided with this package +- Add patch to drop extras_require field from setup.py, + required for SLES12 as the setuptools version is too old + + amc_drop-extras-require.patch +- Bump minimum version for namespace packages + to 3.0.0 in BuildRequires and Requires +- Remove python-devel package from BuildRequires +- Refresh patches for new version + + amc_drop-compatible-releases-operator.patch +- Run fdupes to hardlink duplicate files + + Add fdupes to BuildRequires + + Add %fdupes invocation to %install +- Update BuildRequires and Requires from setup.py + ------------------------------------------------------------------- Mon Sep 3 14:53:57 UTC 2018 - John Paul Adrian Glaubitz diff --git a/python-azure-mgmt-containerregistry.spec b/python-azure-mgmt-containerregistry.spec index b27200c..f945857 100644 --- a/python-azure-mgmt-containerregistry.spec +++ b/python-azure-mgmt-containerregistry.spec @@ -1,7 +1,7 @@ # # spec file for package python-azure-mgmt-containerregistry # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,13 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-azure-mgmt-containerregistry -Version: 2.1.0 +Version: 2.7.0 Release: 0 Summary: Microsoft Azure Container Registry Client Library License: MIT @@ -27,16 +27,17 @@ Url: https://github.com/Azure/azure-sdk-for-python Source: https://files.pythonhosted.org/packages/source/a/azure-mgmt-containerregistry/azure-mgmt-containerregistry-%{version}.zip Source1: LICENSE.txt Patch1: amc_drop-compatible-releases-operator.patch -BuildRequires: %{python_module azure-mgmt-nspkg} -BuildRequires: %{python_module azure-nspkg} -BuildRequires: %{python_module devel} +Patch2: amc_drop-extras-require.patch +BuildRequires: %{python_module azure-mgmt-nspkg >= 3.0.0} +BuildRequires: %{python_module azure-nspkg >= 3.0.0} BuildRequires: %{python_module setuptools} +BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: unzip Requires: python-azure-common < 2.0.0 -Requires: python-azure-common >= 1.1.10 -Requires: python-azure-mgmt-nspkg -Requires: python-azure-nspkg +Requires: python-azure-common >= 1.1 +Requires: python-azure-mgmt-nspkg >= 3.0.0 +Requires: python-azure-nspkg >= 3.0.0 Requires: python-msrest >= 0.5.0 Requires: python-msrestazure < 2.0.0 Requires: python-msrestazure >= 0.4.32 @@ -57,6 +58,7 @@ This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7. %prep %setup -q -n azure-mgmt-containerregistry-%{version} %patch1 -p1 +%patch2 -p1 %build install -m 644 %{SOURCE1} %{_builddir}/azure-mgmt-containerregistry-%{version} @@ -64,6 +66,7 @@ install -m 644 %{SOURCE1} %{_builddir}/azure-mgmt-containerregistry-%{version} %install %python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} %{python_expand # delete common files rm -rf %{buildroot}%{$python_sitelib}/azure/mgmt/__init__.* rm -rf %{buildroot}%{$python_sitelib}/azure/mgmt/__pycache__