diff --git a/image_projects.patch b/image_projects.patch new file mode 100644 index 0000000..0d43749 --- /dev/null +++ b/image_projects.patch @@ -0,0 +1,57 @@ +Index: apache-libcloud-2.3.0/libcloud/compute/drivers/gce.py +=================================================================== +--- apache-libcloud-2.3.0.orig/libcloud/compute/drivers/gce.py ++++ apache-libcloud-2.3.0/libcloud/compute/drivers/gce.py +@@ -1751,16 +1751,42 @@ class GCENodeDriver(NodeDriver): + } + + IMAGE_PROJECTS = { +- "centos-cloud": ["centos"], +- "coreos-cloud": ["coreos"], +- "debian-cloud": ["debian", "backports"], +- "gce-nvme": ["nvme-backports"], +- "google-containers": ["container-vm"], +- "opensuse-cloud": ["opensuse"], +- "rhel-cloud": ["rhel"], +- "suse-cloud": ["sles", "suse"], +- "ubuntu-os-cloud": ["ubuntu"], +- "windows-cloud": ["windows"], ++ "centos-cloud": ["centos-6", "centos-7"], ++ "cos-cloud": ["cos-beta", "cos-dev", "cos-stable"], ++ "coreos-cloud": ["coreos-alpha", "coreos-beta", "coreos-stable"], ++ "debian-cloud": ["debian-8", "debian-9"], ++ "opensuse-cloud": ["opensuse-leap"], ++ "rhel-cloud": ["rhel-6", "rhel-7"], ++ "suse-cloud": ["sles-11", "sles-12", "sles-15"], ++ "suse-byos-cloud": [ ++ "sles-11-byos", "sles-12-byos", ++ "sles-12-sp2-sap-byos", "sles-12-sp3-sap-byos", ++ "sles-15-sap-byos", ++ "suse-manager-proxy-byos", "suse-manager-server-byos" ++ ], ++ "suse-sap-cloud": [ ++ "sles-12-sp2-sap", "sles-12-sp3-sap", ++ "sles-15-sap" ++ ], ++ "ubuntu-os-cloud": [ ++ "ubuntu-1404-lts", "ubuntu-1604-lts", "ubuntu-1710" ++ ], ++ "windows-cloud": [ ++ "windows-1709-core-for-containers", "windows-1709-core", ++ "windows-2008-r2", "windows-2012-r2-core", "windows-2012-r2", ++ "windows-2016-core", "windows-2016" ++ ], ++ "windows-sql-cloud": [ ++ "sql-ent-2012-win-2012-r2", "sql-std-2012-win-2012-r2", ++ "sql-web-2012-win-2012-r2", "sql-ent-2014-win-2012-r2", ++ "sql-ent-2014-win-2016", "sql-std-2014-win-2012-r2", ++ "sql-web-2014-win-2012-r2", "sql-ent-2016-win-2012-r2", ++ "sql-ent-2016-win-2016", "sql-std-2016-win-2012-r2", ++ "sql-std-2016-win-2016", "sql-web-2016-win-2012-r2", ++ "sql-web-2016-win-2016", "sql-ent-2017-win-2016", ++ "sql-exp-2017-win-2012-r2", "sql-exp-2017-win-2016", ++ "sql-std-2017-win-2016", "sql-web-2017-win-2016" ++ ], + } + + BACKEND_SERVICE_PROTOCOLS = ['HTTP', 'HTTPS', 'HTTP2', 'TCP', 'SSL'] diff --git a/python-apache-libcloud.changes b/python-apache-libcloud.changes index 35db67b..84e27a0 100644 --- a/python-apache-libcloud.changes +++ b/python-apache-libcloud.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 14 17:57:22 UTC 2018 - sean.marlow@suse.com + +- Cleanup RPM warnings. +- Add image_projects.patch with updated list of latest image + projects. + ------------------------------------------------------------------- Wed Jun 6 13:14:09 UTC 2018 - jengelh@inai.de diff --git a/python-apache-libcloud.spec b/python-apache-libcloud.spec index 34122cd..9f7be81 100644 --- a/python-apache-libcloud.spec +++ b/python-apache-libcloud.spec @@ -25,6 +25,7 @@ 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 +Patch1: image_projects.patch BuildRequires: %{python_module lxml} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module xml} @@ -34,10 +35,10 @@ BuildRequires: python-rpm-macros BuildRequires: python2 Requires: python-lxml Requires: python-requests +BuildArch: noarch %ifpython2 Requires: python2 %endif -BuildArch: noarch %python_subpackages %description @@ -46,12 +47,16 @@ differences among multiple cloud provider APIs. %prep %setup -q -n apache-libcloud-%{version} +%patch1 -p1 %build %python_build %install %python_install +find %{buildroot} -name '*.DS_Store' -delete +find %{buildroot} -name '*.json' -size 0 -delete +find %{buildroot} -name '*.pem' -size 0 -delete %python_expand %fdupes -s %{buildroot}%{$python_sitelib} %files %{python_files}