From 85c93f76f09bf589873cd9c7968bb67dd93623838abdb98bddb1f9906b903487 Mon Sep 17 00:00:00 2001 From: Niels Abspoel Date: Sat, 30 Sep 2017 19:28:09 +0000 Subject: [PATCH 1/2] Accepting request 530138 from home:mcalmer:branches:devel:languages:python - fix build on SLE12 by using python-backports - reduce warnings OBS-URL: https://build.opensuse.org/request/show/530138 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-apache-libcloud?expand=0&rev=72 --- fix-backports-usage.patch | 12 ++++++++++++ python-apache-libcloud.changes | 6 ++++++ python-apache-libcloud.spec | 6 +++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 fix-backports-usage.patch diff --git a/fix-backports-usage.patch b/fix-backports-usage.patch new file mode 100644 index 0000000..a181aa9 --- /dev/null +++ b/fix-backports-usage.patch @@ -0,0 +1,12 @@ +diff -uNr apache-libcloud-2.0.0.orig/libcloud/utils/py3.py apache-libcloud-2.0.0/libcloud/utils/py3.py +--- apache-libcloud-2.0.0.orig/libcloud/utils/py3.py 2017-09-30 15:18:35.359491824 +0200 ++++ apache-libcloud-2.0.0/libcloud/utils/py3.py 2017-09-30 15:19:00.418868653 +0200 +@@ -68,7 +68,7 @@ + if sys.version_info >= (3, 2) and sys.version_info < (3, 3): + PY32 = True + +-if PY2_pre_279 or PY3_pre_32: ++if PY2 or PY3_pre_32: + try: + from backports.ssl_match_hostname import match_hostname, CertificateError # NOQA + except ImportError: diff --git a/python-apache-libcloud.changes b/python-apache-libcloud.changes index 53c6745..ad53d20 100644 --- a/python-apache-libcloud.changes +++ b/python-apache-libcloud.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Sep 30 13:29:33 UTC 2017 - mc@suse.com + +- fix build on SLE12 by using python-backports +- reduce warnings + ------------------------------------------------------------------- Tue May 16 16:37:05 UTC 2017 - jmatejek@suse.com diff --git a/python-apache-libcloud.spec b/python-apache-libcloud.spec index 0c14dec..ca094e6 100644 --- a/python-apache-libcloud.spec +++ b/python-apache-libcloud.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + #nospeccleaner %{?!python_module:%define python_module() python-%{**} python3-%{**}} @@ -26,10 +27,12 @@ License: Apache-2.0 Group: System/Monitoring Url: https://libcloud.apache.org Source0: https://files.pythonhosted.org/packages/source/a/apache-libcloud/apache-libcloud-%{version}.tar.gz +Patch0: fix-backports-usage.patch BuildRequires: %{python_module lxml} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module xml} BuildRequires: fdupes +BuildRequires: python-backports.ssl_match_hostname BuildRequires: python-rpm-macros %if 0%{?suse_version} >= 1210 BuildRequires: systemd @@ -46,13 +49,14 @@ differences among multiple cloud provider APIs. %prep %setup -q -n apache-libcloud-%{version} +%patch0 -p1 %build %python_build %install %python_install -%fdupes %{buildroot}%{python_sitelib}/libcloud/test/ +%fdupes %{buildroot}%{_prefix} %files %{python_files} %defattr(-,root,root) From 97a07ee0a3f226002a735148e6890e480521b8e78b164775a9917e154c8c2762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 2 May 2018 15:36:50 +0000 Subject: [PATCH 2/2] - Version update to 2.3.0: * For the changes see CHANGES.rst as it is too long * many various bugfixes - Drop no longer applying patch fix-backports-usage.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-apache-libcloud?expand=0&rev=73 --- apache-libcloud-2.0.0.tar.gz | 3 --- apache-libcloud-2.3.0.tar.gz | 3 +++ fix-backports-usage.patch | 12 ------------ python-apache-libcloud.changes | 8 ++++++++ python-apache-libcloud.spec | 20 ++++++-------------- 5 files changed, 17 insertions(+), 29 deletions(-) delete mode 100644 apache-libcloud-2.0.0.tar.gz create mode 100644 apache-libcloud-2.3.0.tar.gz delete mode 100644 fix-backports-usage.patch diff --git a/apache-libcloud-2.0.0.tar.gz b/apache-libcloud-2.0.0.tar.gz deleted file mode 100644 index d21412c..0000000 --- a/apache-libcloud-2.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c72add0e74ca975bc51d9ad9cf3861a25825a76df56132c569b4b3c904f8e1a8 -size 1704652 diff --git a/apache-libcloud-2.3.0.tar.gz b/apache-libcloud-2.3.0.tar.gz new file mode 100644 index 0000000..4ac1a8d --- /dev/null +++ b/apache-libcloud-2.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e2eee3802163bd0605975ed1e284cafc23203919bfa80c0cc5d3cd2543aaf97 +size 1801711 diff --git a/fix-backports-usage.patch b/fix-backports-usage.patch deleted file mode 100644 index a181aa9..0000000 --- a/fix-backports-usage.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr apache-libcloud-2.0.0.orig/libcloud/utils/py3.py apache-libcloud-2.0.0/libcloud/utils/py3.py ---- apache-libcloud-2.0.0.orig/libcloud/utils/py3.py 2017-09-30 15:18:35.359491824 +0200 -+++ apache-libcloud-2.0.0/libcloud/utils/py3.py 2017-09-30 15:19:00.418868653 +0200 -@@ -68,7 +68,7 @@ - if sys.version_info >= (3, 2) and sys.version_info < (3, 3): - PY32 = True - --if PY2_pre_279 or PY3_pre_32: -+if PY2 or PY3_pre_32: - try: - from backports.ssl_match_hostname import match_hostname, CertificateError # NOQA - except ImportError: diff --git a/python-apache-libcloud.changes b/python-apache-libcloud.changes index ad53d20..99d7e2f 100644 --- a/python-apache-libcloud.changes +++ b/python-apache-libcloud.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed May 2 15:33:17 UTC 2018 - tchvatal@suse.com + +- Version update to 2.3.0: + * For the changes see CHANGES.rst as it is too long + * many various bugfixes +- Drop no longer applying patch fix-backports-usage.patch + ------------------------------------------------------------------- Sat Sep 30 13:29:33 UTC 2017 - mc@suse.com diff --git a/python-apache-libcloud.spec b/python-apache-libcloud.spec index ca094e6..977f82c 100644 --- a/python-apache-libcloud.spec +++ b/python-apache-libcloud.spec @@ -1,7 +1,7 @@ # # spec file for package python-apache-libcloud # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -16,30 +16,23 @@ # -#nospeccleaner - %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-apache-libcloud -Version: 2.0.0 +Version: 2.3.0 Release: 0 Summary: Abstract away differences among multiple cloud provider APIs License: Apache-2.0 Group: System/Monitoring -Url: https://libcloud.apache.org +URL: https://libcloud.apache.org Source0: https://files.pythonhosted.org/packages/source/a/apache-libcloud/apache-libcloud-%{version}.tar.gz -Patch0: fix-backports-usage.patch BuildRequires: %{python_module lxml} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module xml} BuildRequires: fdupes BuildRequires: python-backports.ssl_match_hostname BuildRequires: python-rpm-macros -%if 0%{?suse_version} >= 1210 -BuildRequires: systemd -%endif Requires: python-lxml Requires: python-requests -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %python_subpackages @@ -49,18 +42,17 @@ differences among multiple cloud provider APIs. %prep %setup -q -n apache-libcloud-%{version} -%patch0 -p1 %build %python_build %install %python_install -%fdupes %{buildroot}%{_prefix} +%python_expand %fdupes -s %{buildroot}%{$python_sitelib} %files %{python_files} -%defattr(-,root,root) -%doc LICENSE CHANGES.rst README.rst +%license LICENSE +%doc CHANGES.rst README.rst %{python_sitelib}/* %changelog