From d7f083c4d03d780edcf9de4b9ab8cd2b761286c0 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Mar 27 2019 17:16:07 +0000
Subject: Subpackage python2-straight-plugin has been removed


---

diff --git a/python-straight-plugin.spec b/python-straight-plugin.spec
index adb9a53..97b9a39 100644
--- a/python-straight-plugin.spec
+++ b/python-straight-plugin.spec
@@ -1,12 +1,6 @@
-%if 0%{?fedora} > 12 || 0%{?rhel} > 7
-%global with_python3 1
-%else
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
-%endif
-
 Name:           python-straight-plugin
 Version:        1.5.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Python plugin loader
 
 License:        BSD
@@ -15,18 +9,11 @@ URL:            https://github.com/ironfroggy/straight.plugin/
 Source0:        https://files.pythonhosted.org/packages/48/89/34ae6a87784d0b607af61c84a52c313c598f1d86ce5c1e9eb6da038fee5f/straight.plugin-%{version}.tar.gz
 
 BuildArch:      noarch
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
 
-%if 0%{?with_python3}
 BuildRequires:  python3-devel
 BuildRequires:  /usr/bin/2to3
 BuildRequires:  python3-setuptools
-%endif
 
-%if (0%{?rhel} && 0%{?rhel} <= 6)  || ( 0%{?fedora} && 0%{?fedora} <= 13 )
-BuildRequires:  python-importlib
-%endif
 
 
 %global _description\
@@ -44,16 +31,6 @@ the plugins in it for some particular purpose or intent.\
 
 %description %_description
 
-%package -n python2-straight-plugin
-Summary: %summary
-%if (0%{?rhel} && 0%{?rhel} <= 6)  || ( 0%{?fedora} && 0%{?fedora} <= 13 )
-Requires:       python-importlib
-%endif
-%{?python_provide:%python_provide python2-straight-plugin}
-
-%description -n python2-straight-plugin %_description
-
-%if 0%{?with_python3}
 %package -n     python3-straight-plugin
 Summary:        Python plugin loader
 
@@ -68,61 +45,29 @@ The system is used to allow multiple Python packages to provide plugins within
 a namespace package, where other packages will locate and utilize. The plugins
 themselves are modules in a namespace package where the namespace identifies
 the plugins in it for some particular purpose or intent.
-%endif
 
 %prep
-%setup -q -c
-
-%if 0%{?with_python3}
-cp -r straight.plugin-%{version}/ py3-straight.plugin-%{version}
-2to3 --write --nobackups py3-straight.plugin-%{version}
-%endif
+%setup -q -n straight.plugin-%{version}
+2to3 --write --nobackups .
 
 %build
-pushd straight.plugin-%{version}
-%{__python2} setup.py build
-popd
-
-%if 0%{?with_python3}
-pushd py3-straight.plugin-%{version}
-%{__python3} setup.py build
-popd
-%endif
+%py3_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-pushd straight.plugin-%{version}
-%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-popd
-
-%if 0%{?with_python3}
-pushd py3-straight.plugin-%{version}
-%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-popd
-%endif
+%py3_install
 
 #%check
-#pushd straight.plugin-%{version}
-#%{__python2} tests.py
-#popd
-#
-#%if 0%{?with_python3}
-#pushd py3-straight.plugin-%{version}
 #%{__python3} tests.py
-#popd
-#%endif
-
-%files -n python2-straight-plugin
-# For noarch packages: sitelib
-%{python2_sitelib}/*
 
-%if 0%{?with_python3}
 %files -n python3-straight-plugin
 # For noarch packages: sitelib
-%{python3_sitelib}/*
-%endif
+%{python3_sitelib}/straight*
 
 %changelog
+* Wed Mar 27 2019 Miro Hrončok <mhroncok@redhat.com> - 1.5.0-7
+- Subpackage python2-straight-plugin 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.5.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild