From 2261c03d23f3dbd7cdfa5f2141af7207dc071d45 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Apr 27 2019 13:47:29 +0000
Subject: Subpackage python2-gabbi has been removed


---

diff --git a/python-gabbi.spec b/python-gabbi.spec
index 8ba312e..80fd32c 100644
--- a/python-gabbi.spec
+++ b/python-gabbi.spec
@@ -1,23 +1,9 @@
 %global pypi_name gabbi
 %global pypi gabbi-run
 
-%if 0%{?fedora}
-%global with_python3 1
-%endif
-
-# Only reason to choose 24 is that that's what was in development when we made
-# the switch for this package.  Fedora Policy was to have made this switch for
-# Fedora 22.
-%if 0%{?fedora} >= 24
-%global default_python 3
-%else
-%global default_python 2
-%endif
-
-
 Name:           python-%{pypi_name}
 Version:        1.42.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Declarative HTTP testing library
 
 License:        ASL 2.0
@@ -30,44 +16,6 @@ BuildArch:      noarch
 Gabbi is a tool for running HTTP tests where requests and responses
 are represented in a declarative YAML-based form.
 
-%package -n python2-%{pypi_name}
-Summary:        Declarative HTTP testing library
-%{?python_provide:%python_provide python2-%{pypi_name}}
-
-BuildRequires:       python2-devel
-BuildRequires:       python2-setuptools
-BuildRequires:       python2-six
-BuildRequires:       python2-pbr
-BuildRequires:       python2-httplib2
-BuildRequires:       python2-wsgi_intercept
-BuildRequires:       python2-colorama
-BuildRequires:       python2-jsonpath-rw-ext
-BuildRequires:       python2-pyyaml
-BuildRequires:       python2-pytest
-BuildRequires:       python2-urllib3
-
-
-Requires:       python2-setuptools
-Requires:       python2-six
-Requires:       python2-pbr
-Requires:       python2-wsgi_intercept
-Requires:       python2-colorama
-Requires:       python2-jsonpath-rw-ext
-Requires:       python2-pytest
-Requires:       python2-pyyaml
-Requires:       python2-urllib3
-Requires:       python2-testtools
-
-# test requirements
-BuildRequires:  python2-mock
-BuildRequires:  python2-testrepository
-BuildRequires:  python2-coverage
-
-%description -n python2-%{pypi_name}
-Gabbi is a tool for running HTTP tests where requests and responses
-are represented in a declarative YAML-based form.
-
-%if 0%{?with_python3}
 %package -n python3-%{pypi_name}
 Summary:        Declarative HTTP testing library
 %{?python_provide:%python_provide python3-%{pypi_name}}
@@ -103,15 +51,13 @@ BuildRequires:  python3-coverage
 %description -n python3-%{pypi_name}
 Gabbi is a tool for running HTTP tests where requests and responses
 are represented in a declarative YAML-based form.
-%endif
 
 %package -n python-%{pypi_name}-doc
 Summary:        Documentation for the gabbi module
 
-BuildRequires:  python2-sphinx
-BuildRequires:  python2-sphinx_rtd_theme
+BuildRequires:  python3-sphinx
+BuildRequires:  python3-sphinx_rtd_theme
 
-Requires:   python2-%{pypi_name}
 %description -n python-%{pypi_name}-doc
 Documentation for the gabbi module
 
@@ -119,25 +65,10 @@ Documentation for the gabbi module
 %setup -q -n %{pypi_name}-%{version}
 
 %build
-%py2_build
-%if 0%{?with_python3}
 %py3_build
-%endif
 
 %install
-%py2_install
-mv %{buildroot}%{_bindir}/%{pypi} %{buildroot}%{_bindir}/python2-%{pypi}
-
-%if 0%{?with_python3}
 %py3_install
-mv %{buildroot}%{_bindir}/%{pypi} %{buildroot}%{_bindir}/python3-%{pypi}
-%endif
-
-%if 0%{?default_python} >= 3
-ln -s %{_bindir}/python3-%{pypi} %{buildroot}%{_bindir}/%{pypi}
-%else
-ln -s %{_bindir}/python2-%{pypi} %{buildroot}%{_bindir}/%{pypi}
-%endif
 
 # generate html docs
 sphinx-build docs/source html
@@ -151,44 +82,26 @@ rm -rf html/.{doctrees,buildinfo}
 # %check
 # some tests are broken so bypassing tests
 # export GABBI_SKIP_NETWORK=true
-# %{__python2} setup.py test ||
-# rm -fr .testrepository
-# %if 0%{?with_python3}
 # %{__python3} setup.py test ||
-# %endif
 
-%files -n python2-%{pypi_name}
-%doc README.rst
-%license LICENSE
-%if 0%{?default_python} <= 2
-%{_bindir}/%{pypi}
-%{_mandir}/man1/gabbi.1*
-%endif
-%{_bindir}/python2-%{pypi}
-%{python2_sitelib}/%{pypi_name}
-%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
-%exclude %{python2_sitelib}/gabbi/tests/gabbits_intercept/horse
-
-
-%if 0%{?with_python3}
 %files -n python3-%{pypi_name}
 %doc README.rst
 %license LICENSE
-%if 0%{?default_python} >= 3
 %{_bindir}/%{pypi}
 %{_mandir}/man1/gabbi.1*
-%endif
-%{_bindir}/python3-%{pypi}
 %{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 %exclude %{python3_sitelib}/gabbi/tests/gabbits_intercept/horse
-%endif
 
 %files -n python-%{pypi_name}-doc
 %doc html
 %license LICENSE
 
 %changelog
+* Sat Apr 27 2019 Miro Hrončok <mhroncok@redhat.com> - 1.42.1-6
+- Subpackage python2-gabbi has been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.42.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild