Reduce Python 2 build time dependencies

This commit is contained in:
Miro Hrončok 2019-09-02 11:31:01 +02:00
parent 6e5dd1aa92
commit 4de2fd905f

View File

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