From 1562bb2cce3fc3acd61d135eddae4c3ad0e79c8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Wed, 9 Jan 2019 13:11:33 +0100
Subject: [PATCH] Subpackage python2-botocore has been removed

---
 python-botocore.spec | 72 ++++++--------------------------------------
 1 file changed, 9 insertions(+), 63 deletions(-)

diff --git a/python-botocore.spec b/python-botocore.spec
index 9c2dae1..f254bae 100644
--- a/python-botocore.spec
+++ b/python-botocore.spec
@@ -1,8 +1,6 @@
 %if 0%{?rhel} && 0%{?rhel} <= 7
-%bcond_with python3
 %bcond_without fix_dateutil
 %else
-%bcond_without python3
 %bcond_with fix_dateutil
 %endif
 
@@ -15,7 +13,7 @@
 
 Name:           python-%{pypi_name}
 Version:        1.12.75
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Low-level, data-driven core of boto 3
 
 License:        ASL 2.0
@@ -28,41 +26,6 @@ BuildArch:      noarch
 A low-level interface to a growing number of Amazon Web Services. The
 botocore package is the foundation for the AWS CLI as well as boto3.
 
-%package -n     python2-%{pypi_name}
-Summary:        Low-level, data-driven core of boto 3
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-%if %{with docs}
-BuildRequires:  python2-sphinx
-BuildRequires:  python-guzzle_sphinx_theme
-%endif # with docs
-%if %{with tests}
-%{?fc23:BuildRequires: mock}
-%{!?fc23:BuildRequires: python2-mock}
-BuildRequires:  python2-behave
-BuildRequires:  python2-nose
-BuildRequires:  python2-six
-BuildRequires:  python2-wheel
-BuildRequires:  python2-docutils
-BuildRequires:  python2-dateutil
-BuildRequires:  python2-jmespath
-%endif # with tests
-Requires:       python2-jmespath >= 0.7.1
-%if %{with fix_dateutil}
-Requires:       python2-dateutil >= 1.4
-%else
-Requires:       python2-dateutil >= 2.1
-%endif # with fix_dateutil
-Requires:       python2-docutils >= 0.10
-Requires:       python2-urllib3
-%{?el6:Provides: python-%{pypi_name}}
-%{?python_provide:%python_provide python2-%{pypi_name}}
-
-%description -n python2-%{pypi_name}
-A low-level interface to a growing number of Amazon Web Services. The
-botocore package is the foundation for the AWS CLI as well as boto3.
-
-%if %{with python3}
 %package -n     python3-%{pypi_name}
 Summary:        Low-level, data-driven core of boto 3
 BuildRequires:  python3-devel
@@ -80,6 +43,8 @@ BuildRequires:  python3-wheel
 BuildRequires:  python3-docutils
 BuildRequires:  python3-dateutil
 BuildRequires:  python3-jmespath
+BuildRequires:  python3-jsonschema
+BuildRequires:  python3-urllib3
 %endif # with tests
 Requires:       python3-jmespath >= 0.7.1
 %if %{with fix_dateutil}
@@ -94,7 +59,6 @@ Requires:       python3-urllib3 >= 1.20
 %description -n python3-%{pypi_name}
 A low-level interface to a growing number of Amazon Web Services. The
 botocore package is the foundation for the AWS CLI as well as boto3.
-%endif # with_python3
 
 %if %{with docs}
 %package doc
@@ -115,57 +79,39 @@ rm -rf %{pypi_name}.egg-info
 rm -rf tests/integration
 
 %build
-%py2_build
-%if %{with python3}
 %py3_build
-%endif # with python3
 
 %install
-%if %{with python3}
 %py3_install
-%endif # with python3
-%py2_install
 %if %{with docs}
-%if %{with python3}
 sphinx-build-3 docs/source html
 rm -rf html/.{doctrees,buildinfo}
-%else # with python3
-sphinx-build docs/source html
-rm -rf html/.{doctrees,buildinfo}
-%endif # with python3
 %endif # with docs
 
 %if %{with tests}
 %check
-# %{__python2} setup.py test
-nosetests-2.7 --with-coverage --cover-erase --cover-package botocore --with-xunit --cover-xml -v tests/unit/ tests/functional/
-%if %{with python3}
 # %{__python3} setup.py test
-nosetests-3.5 --with-coverage --cover-erase --cover-package botocore --with-xunit --cover-xml -v tests/unit/ tests/functional/
-%endif # with python3
+export PYTHONPATH=%{buildroot}%{python3_sitelib}
+nosetests-3 --with-coverage --cover-erase --cover-package botocore --with-xunit --cover-xml -v tests/unit/ tests/functional/
 %endif # with tests
 
 %{!?_licensedir:%global license %doc}
 
-%files -n python2-%{pypi_name}
-%doc README.rst
-%license LICENSE.txt
-%{python2_sitelib}/%{pypi_name}/
-%{python2_sitelib}/%{pypi_name}-*.egg-info/
-
-%if %{with python3}
 %files -n python3-%{pypi_name}
 %doc README.rst
 %license LICENSE.txt
 %{python3_sitelib}/%{pypi_name}/
 %{python3_sitelib}/%{pypi_name}-*.egg-info/
-%endif # with python3
 %if %{with docs}
 %files doc
 %doc html
 %endif # with docs
 
 %changelog
+* Wed Jan 09 2019 Miro Hrončok <mhroncok@redhat.com> - 1.12.75-2
+- Subpackage python2-botocore has been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
 * Tue Jan 08 2019 David Duncan <davdunc@amazon.com> - 1.12.75
 - Update to latest endpoints
 - Update to latest models