From cb20a73b692bd45a0f6d6afde4ef2d19b6aca1c1 Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@fedoraproject.org>
Date: Sep 20 2018 12:12:52 +0000
Subject: Resolves:rh#1631324: Remove python2 subpackage


---

diff --git a/fontdump.spec b/fontdump.spec
index adbb953..2a3d34c 100644
--- a/fontdump.spec
+++ b/fontdump.spec
@@ -1,44 +1,33 @@
+%{?python_enable_dependency_generator}
 %global srcname fontdump
 %global sum Dump the CSS and different formats of fonts for Google Fonts
 
 Name:           %{srcname}
 Version:        1.3.0
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        %{sum}
 
 License:        MIT
 URL:            https://github.com/glasslion/fontdump
-Source0:        http://pypi.python.org/packages/source/f/%{srcname}/%{srcname}-%{version}.tar.gz
+Source0:        %{pypi_source %{srcname}}
 
 BuildArch:      noarch
-BuildRequires:  python2-devel python3-devel
-Requires:       python3-fontdump
-Requires:       python3-cssutils
-Requires:       python3-docopt
-Requires:       python3-requests
+BuildRequires:  python3-devel
+Requires:       python3-%{srcname}
 
 %description
 A command line tool to dump the CSS and different formats of fonts for Google
 Fonts, so you can serve them on your local servers.
 
-%package -n python2-%{srcname}
-Summary:        %{sum}
-BuildRequires:   python2-docopt
-BuildRequires:   python2-cssutils
-BuildRequires:   python2-requests
-%{?python_provide:%python_provide python2-%{srcname}}
-
-%description -n python2-%{srcname}
-A command line tool to dump the CSS and different formats of fonts for Google
-Fonts, so you can serve them on your local servers.
-
-
 %package -n python3-%{srcname}
 Summary:        %{sum}
-BuildRequires:   python3-docopt
-BuildRequires:   python3-cssutils
-BuildRequires:   python3-requests
+BuildRequires:   python3dist(docopt)
+BuildRequires:   python3dist(cssutils)
+BuildRequires:   python3dist(requests)
 %{?python_provide:%python_provide python3-%{srcname}}
+Requires:        python3dist(cssutils)
+Requires:        python3dist(docopt)
+Requires:        python3dist(requests)
 
 %description -n python3-%{srcname}
 A command line tool to dump the CSS and different formats of fonts for Google
@@ -49,29 +38,17 @@ Fonts, so you can serve them on your local servers.
 sed -i -e '/^#!\//, 1d' fontdump/*.py
 
 %build
-%py2_build
 %py3_build
 
 %install
-# Must do the python2 install first because the scripts in /usr/bin are
-# overwritten with every setup.py install, and in general we want the
-# python3 version to be the default.
-%py2_install
 %py3_install
 
 %check
-%{__python2} setup.py test
 %{__python3} setup.py test
 
 %files
 %{_bindir}/%{srcname}
 
-%files -n python2-%{srcname}
-%doc PKG-INFO
-%license LICENSE
-%{python2_sitelib}/%{srcname}
-%{python2_sitelib}/%{srcname}-%{version}-py2.*.egg-info
-
 %files -n python3-%{srcname}
 %doc PKG-INFO
 %license LICENSE
@@ -79,6 +56,9 @@ sed -i -e '/^#!\//, 1d' fontdump/*.py
 %{python3_sitelib}/%{srcname}-%{version}-py3.*.egg-info
 
 %changelog
+* Thu Sep 20 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.3.0-13
+- Resolves:rh#1631324: Remove python2 subpackage
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild