From 9aa23da8ca02c501c4a2970c743506aad2121a36 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Nov 22 2018 18:39:59 +0000
Subject: Drop python2 subpackage (bz 1645073).


---

diff --git a/python-orderedset.spec b/python-orderedset.spec
index 9a84972..5590d18 100644
--- a/python-orderedset.spec
+++ b/python-orderedset.spec
@@ -1,31 +1,20 @@
-%if 0%{?fedora} || 0%{?rhel} >= 8
-%global with_python3 1
-%endif
-
 %global srcname orderedset
 %global user simonpercivall
 
 Name:           python-%{srcname}
 Version:        2.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Ordered set implementation in Cython
 
 License:        BSD
 URL:            https://github.com/%{user}/%{srcname}
-Source0:        https://files.pythonhosted.org/packages/source/o/%{srcname}/%{srcname}-%{version}.tar.gz
+Source0:        %pypi_source
 
 BuildRequires:  gcc
-BuildRequires:  python2-coverage
-BuildRequires:  python2-Cython
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-
-%if 0%{?with_python3}
 BuildRequires:  python3-coverage
 BuildRequires:  python3-Cython
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-%endif
 
 %global common_desc \
 This package contains an ordered set implementation in Cython.  Features:\
@@ -40,17 +29,6 @@ This package contains an ordered set implementation in Cython.  Features:\
 %description
 %common_desc
 
-%package -n python2-%{srcname}
-Summary:        Ordered set implementation in Cython
-
-Provides:       bundled(jquery)
-Provides:       bundled(js-underscore)
-%{?python_provide:%python_provide python2-%{srcname}}
-
-%description -n python2-%{srcname}
-%common_desc
-
-%if 0%{?with_python3}
 %package -n python3-%{srcname}
 Summary:        Ordered set implementation in Cython
 
@@ -58,74 +36,35 @@ Provides:       bundled(jquery)
 Provides:       bundled(js-underscore)
 %{?python_provide:%python_provide python3-%{srcname}}
 
+# This can be removed when F29 reaches EOL
+Obsoletes:      python2-%{srcname} < 2.0.1-4
+Provides:       python2-%{srcname} = %{version}-%{release}
+
 %description -n python3-%{srcname}
 %common_desc
-%endif
 
 %prep
-%setup -q -c
-
-# Prepare for python3 build
-cp -a %{srcname}-%{version} python3-%{srcname}-%{version}
+%autosetup -n %{srcname}-%{version}
 
 %build
-# Python 2 build
-pushd %{srcname}-%{version}
-%py2_build
-popd
-
-%if 0%{?with_python3}
-# Python 3 build
-pushd python3-%{srcname}-%{version}
 %py3_build
-popd
-%endif
 
 %install
-# Python 2 install
-pushd %{srcname}-%{version}
-%py2_install
-chmod 0755 %{buildroot}%{python2_sitearch}/%{srcname}/*.so
-popd
-
-%if 0%{?with_python3}
-# Python 3 install
-pushd python3-%{srcname}-%{version}
 %py3_install
 chmod 0755 %{buildroot}%{python3_sitearch}/%{srcname}/*.so
-popd
-%endif
 
 %check
-# Test the python 2 build
-pushd %{srcname}-%{version}
-PYTHONPATH=$PWD %{__python2} setup.py test
-popd
-
-%if 0%{?with_python3}
-# Python 3 install
-pushd python3-%{srcname}-%{version}
 PYTHONPATH=$PWD %{__python3} setup.py test
-popd
-%endif
-
-%files -n python2-%{srcname}
-%doc %{srcname}-%{version}/AUTHORS.rst
-%doc %{srcname}-%{version}/HISTORY.rst
-%doc %{srcname}-%{version}/README.rst
-%license %{srcname}-%{version}/LICENSE
-%{python2_sitearch}/%{srcname}*
 
-%if 0%{?with_python3}
 %files -n python3-%{srcname}
-%doc python3-%{srcname}-%{version}/AUTHORS.rst
-%doc python3-%{srcname}-%{version}/HISTORY.rst
-%doc python3-%{srcname}-%{version}/README.rst
-%license python3-%{srcname}-%{version}/LICENSE
+%doc AUTHORS.rst HISTORY.rst README.rst
+%license LICENSE
 %{python3_sitearch}/%{srcname}*
-%endif
 
 %changelog
+* Thu Nov 22 2018 Jerry James <loganjerry@gmail.com> - 2.0.1-4
+- Drop python2 subpackage (bz 1645073)
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild