diff --git a/pyparsing.spec b/pyparsing.spec index 8fc3ca5..8d2b472 100644 --- a/pyparsing.spec +++ b/pyparsing.spec @@ -3,8 +3,7 @@ %global build_wheel 1 -%global python2_wheelname %{srcname}-%{version}-py2.py3-none-any.whl -%global python3_wheelname %python2_wheelname +%global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl # when bootstrapping Python 3, pyparsing needs to be rebuilt before sphinx %bcond_without doc @@ -12,7 +11,7 @@ Summary: %{sum} Name: pyparsing Version: 2.4.0 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT URL: https://github.com/pyparsing/pyparsing @@ -30,8 +29,6 @@ BuildRequires: python3-sphinx %endif %if 0%{?build_wheel} -BuildRequires: python2-pip -BuildRequires: python2-wheel BuildRequires: python%{python3_pkgversion}-pip BuildRequires: python%{python3_pkgversion}-wheel %endif @@ -78,11 +75,7 @@ dos2unix -k CHANGES LICENSE %build -%if 0%{?build_wheel} -%py2_build_wheel -%else %py2_build -%endif %if 0%{?build_wheel} %py3_build_wheel %else @@ -99,13 +92,9 @@ popd %endif %install -%if 0%{?build_wheel} -%py2_install_wheel %{python2_wheelname} -%else %py2_install -%endif %if 0%{?build_wheel} -%py3_install_wheel %{python3_wheelname} +%py3_install_wheel %{python_wheelname} %else %py3_install %endif @@ -121,14 +110,14 @@ popd %license LICENSE %doc CHANGES README.rst %{python2_sitelib}/pyparsing.py* -%{python2_sitelib}/pyparsing-*dist-info/ +%{python2_sitelib}/pyparsing-*-info/ %files -n python3-pyparsing %license LICENSE %doc CHANGES README.rst %{python3_sitelib}/pyparsing.py %{python3_sitelib}/__pycache__/* -%{python3_sitelib}/pyparsing-*dist-info/ +%{python3_sitelib}/pyparsing-*-info/ %if %{with doc} %files doc @@ -138,6 +127,9 @@ popd %changelog +* Mon Sep 02 2019 Miro Hrončok - 2.4.0-6 +- Reduce Python 2 build time dependencies + * Thu Aug 15 2019 Miro Hrončok - 2.4.0-5 - Rebuilt for Python 3.8