[rpms/python-futurist] noevent: Sync from RDO train release

[rpms/python-futurist] noevent: Sync from RDO train release

[Alfredo Moralejo]

A new commit has been pushed.

Repo   : rpms/python-futurist
Branch : noevent
Commit : fc67aae78151f6c8a2eb4fc3d10bbc290dfcac79
Author : Alfredo Moralejo <amoralej@redhat.com>
Date   : 2019-11-06T15:56:37+01:00
Stats  : +53/-25 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/python-futurist/c/fc67aae78151f6c8a2eb4fc3d10bbc290dfcac79?branch=noevent

Log:
Sync from RDO train release

---
diff --git a/.gitignore b/.gitignore
index 784cc55..4864bfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /futurist-0.19.0.tar.gz
 /futurist-1.7.0.tar.gz
 /futurist-1.8.1.tar.gz
+/futurist-1.9.0.tar.gz

diff --git a/python-futurist.spec b/python-futurist.spec
index e994c1c..197b065 100644
--- a/python-futurist.spec
+++ b/python-futurist.spec
@@ -1,3 +1,14 @@
+# Macros for py2/py3 compatibility
+%if 0%{?fedora} || 0%{?rhel} > 7
+%global pyver %{python3_pkgversion}
+%else
+%global pyver 2
+%endif
+%global pyver_bin python%{pyver}
+%global pyver_sitelib %python%{pyver}_sitelib
+%global pyver_install %py%{pyver}_install
+%global pyver_build %py%{pyver}_build
+# End of macros for py2/py3 compatibility
 
 %global with_doc 1
 
@@ -9,37 +20,50 @@
 Code from the future, delivered to you in the now.
 
 Name:           python-%{pypi_name}
-Version:        1.8.1
-Release:        4%{?dist}
+Version:        1.9.0
+Release:        2%{?dist}
 Summary:        Useful additions to futures, from the future
 
 License:        ASL 2.0
 URL:            http://docs.openstack.org/developer/futurist
 Source0:        https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz
 BuildArch:      noarch
- 
-%package -n python3-%{pypi_name}
-Summary:        Useful additions to futures, from the future
-%{?python_provide:%python_provide python3-%{pypi_name}}
 
-BuildRequires:  python3-devel
-BuildRequires:  python3-pbr
-BuildRequires:  python3-prettytable
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-six
+%package -n python%{pyver}-%{pypi_name}
+Summary:        Useful additions to futures, from the future
+%{?python_provide:%python_provide python%{pyver}-%{pypi_name}}
+
+BuildRequires:  python%{pyver}-devel
+BuildRequires:  python%{pyver}-pbr
+BuildRequires:  git
+BuildRequires:  python%{pyver}-prettytable
+BuildRequires:  python%{pyver}-setuptools
+BuildRequires:  python%{pyver}-six
+BuildRequires:  python%{pyver}-contextlib2
+# Handle python2 exception
+%if %{pyver} == 2
+BuildRequires:  python%{pyver}-futures
+BuildRequires:  python%{pyver}-monotonic
+%endif
 
-Requires:       python3-six >= 1.10.0
-Requires:       python3-contextlib2 >= 0.4.0
-Requires:       python3-prettytable
+Requires:       python%{pyver}-six >= 1.10.0
+Requires:       python%{pyver}-prettytable
+Requires:       python%{pyver}-contextlib2 >= 0.4.0
+# Handle python2 exception
+%if %{pyver} == 2
+Requires:       python%{pyver}-futures >= 3.0
+Requires:       python%{pyver}-monotonic
+%endif
 
-%description -n python3-%{pypi_name}
+%description -n python%{pyver}-%{pypi_name}
 %{common_desc}
 
 %if 0%{?with_doc}
 %package -n python-%{pypi_name}-doc
 Summary:        Useful additions to futures, from the future - documentation
-BuildRequires:  python3-sphinx
-BuildRequires:  python3-openstackdocstheme
+
+BuildRequires:  python%{pyver}-sphinx
+BuildRequires:  python%{pyver}-openstackdocstheme
 
 %description -n python-%{pypi_name}-doc
 %{common_desc}
@@ -56,23 +80,23 @@ Futurist
 %autosetup -n %{pypi_name}-%{upstream_version} -S git
 
 %build
-%py3_build
+%{pyver_build}
 
 %if 0%{?with_doc}
 # generate html docs
-sphinx-build-3 -W -b html doc/source doc/build/html
-# remove the sphinx-build-3 leftovers
+sphinx-build-%{pyver} -W -b html doc/source doc/build/html
+# remove the sphinx-build-%{pyver} leftovers
 rm -rf doc/build/html/.{doctrees,buildinfo}
 %endif
 
 %install
-%py3_install
+%{pyver_install}
 
-%files -n python3-%{pypi_name}
+%files -n python%{pyver}-%{pypi_name}
 %doc README.rst
 %license LICENSE
-%{python3_sitelib}/%{pypi_name}
-%{python3_sitelib}/%{pypi_name}-*-py?.?.egg-info
+%{pyver_sitelib}/%{pypi_name}
+%{pyver_sitelib}/%{pypi_name}-*-py?.?.egg-info
 
 %if 0%{?with_doc}
 %files -n python-%{pypi_name}-doc
@@ -81,6 +105,9 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %endif
 
 %changelog
+* Wed Nov 06 2019 Alfredo Moralejo <amoralej@redhat.com> 1.9.0-2
+- Update to upstream version 1.9.0
+
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.8.1-4
 - Rebuilt for Python 3.8.0rc1 (#1748018)
 

diff --git a/sources b/sources
index 8917061..4a3d43b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (futurist-1.8.1.tar.gz) = 4ec292284a1a6a7675bd9970f391bfcc47841c42beedac8348b23755481c4f87a2467dbb0f8c963c4b9fc8148a8aaca43e3c166878d07c9e48720481b0f73d9b
+SHA512 (futurist-1.9.0.tar.gz) = ce7563528a321a07d80c2cf1d961afda6c718cd9f1526b0d3b3d1fa0959d994a3ed3fa2da358a9f66451ba303356bbf54e78d8679048cb2bb21a10d853460b38