From 2f9143eceb9eea91730c47f000b1fc7f951dad57 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Nov 12 2018 10:38:29 +0000
Subject: Remove Python 2 subpackage


---

diff --git a/python-nbconvert.spec b/python-nbconvert.spec
index 9a06056..bf22be2 100644
--- a/python-nbconvert.spec
+++ b/python-nbconvert.spec
@@ -2,18 +2,14 @@
 
 Name:           python-%{pypi_name}
 Version:        5.3.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Converting Jupyter Notebooks
 
 License:        BSD and MIT
 URL:            http://jupyter.org
-Source0:        https://files.pythonhosted.org/packages/source/n/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+Source0:        %pypi_source
 BuildArch:      noarch
- 
-BuildRequires:  python2-setuptools
-BuildRequires:  python2-devel
-BuildRequires:  python2-sphinx
- 
+
 BuildRequires:  python3-pandocfilters
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-testpath
@@ -36,31 +32,6 @@ formats via Jinja templates. The nbconvert tool allows you to convert an
 .ipynb notebook file into various static formats including HTML, LaTeX, 
 PDF, Reveal JS, Markdown (md), ReStructured Text (rst) and executable script.
 
-%package -n     python2-%{pypi_name}
-Summary:        Converting Jupyter Notebooks
-%{?python_provide:%python_provide python2-%{pypi_name}}
- 
-Requires:       python2-jinja2
-Requires:       python2-pygments
-Requires:       python2-traitlets
-Requires:       python2-jupyter_core
-Requires:       python2-nbformat
-Requires:       python2-entrypoints
-Requires:       python2-setuptools
-Requires:       python2-testpath
-Requires:       python2-pandocfilters
-Requires:       python2-mistune
-Requires:       python2-bleach
-Requires:       python2-defusedxml
-Requires:       python2-jupyter-client
-
-%description -n python2-%{pypi_name}
-
-The nbconvert tool, jupyter nbconvert, converts notebooks to various other 
-formats via Jinja templates. The nbconvert tool allows you to convert an 
-.ipynb notebook file into various static formats including HTML, LaTeX, 
-PDF, Reveal JS, Markdown (md), ReStructured Text (rst) and executable script.
-
 %package -n     python3-%{pypi_name}
 Summary:        Converting Jupyter Notebooks
 %{?python_provide:%python_provide python3-%{pypi_name}}
@@ -79,11 +50,6 @@ Requires:       python3-bleach
 Requires:       python3-defusedxml
 Requires:       python3-jupyter-client
 
-# executables moved from py2 to py3
-# https://bugzilla.redhat.com/show_bug.cgi?id=1410332
-# Can be removed in Fedora 30
-Conflicts:      python2-%{pypi_name} < 5.2.1-3
-
 %description -n python3-%{pypi_name}
 
 The nbconvert tool, jupyter nbconvert, converts notebooks to various other 
@@ -101,7 +67,6 @@ Documentation for nbconvert
 rm -rf %{pypi_name}.egg-info
 
 %build
-%py2_build
 %py3_build
 
 %if %{with doc}
@@ -110,27 +75,12 @@ rm -rf html/.{doctrees,buildinfo}
 %endif
 
 %install
-%py2_install
-rm %{buildroot}%{_bindir}/*
-
-# fix permissions and shebangs
-sed -i '1s=^#!/usr/bin/\(python\|env python\)[23]\?=#!%{__python2}=' %{buildroot}%{python2_sitelib}/%{pypi_name}/nbconvertapp.py
-chmod 755 %{buildroot}%{python2_sitelib}/%{pypi_name}/nbconvertapp.py
-
-
 %py3_install
 
 # fix permissions and shebangs
 sed -i '1s=^#!/usr/bin/\(python\|env python\)[23]\?=#!%{__python3}=' %{buildroot}%{python3_sitelib}/%{pypi_name}/nbconvertapp.py
 chmod 755 %{buildroot}%{python3_sitelib}/%{pypi_name}/nbconvertapp.py
 
-
-%files -n python2-%{pypi_name}
-%license LICENSE
-%doc docs/README.md
-%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
-%{python2_sitelib}/%{pypi_name}/
-
 %files -n python3-%{pypi_name}
 %license LICENSE
 %doc docs/README.md
@@ -144,6 +94,9 @@ chmod 755 %{buildroot}%{python3_sitelib}/%{pypi_name}/nbconvertapp.py
 %endif
 
 %changelog
+* Mon Nov 12 2018 Miro Hrončok <mhroncok@redhat.com> - 5.3.1-11
+- Remove Python 2 subpackage
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild