Compare commits

...

No commits in common. "c8-beta-stream-3.9" and "c8-stream-3.8" have entirely different histories.

3 changed files with 14 additions and 39 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/pyparsing-2.4.7.tar.gz SOURCES/pyparsing-2.4.5.tar.gz

View File

@ -1 +1 @@
b1ce3d1aa0314e2e6a5356dcd9624b4e8adff84e SOURCES/pyparsing-2.4.7.tar.gz 168a89f0288eba4f01f8f097b3a788d8c929c271 SOURCES/pyparsing-2.4.5.tar.gz

View File

@ -1,17 +1,16 @@
%global srcname pyparsing %global srcname pyparsing
%global _summary Python package with an object-oriented approach to text processing
%global build_wheel 1 %global build_wheel 0
%global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl %global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl
# when bootstrapping Python 3, pyparsing needs to be rebuilt before sphinx # when bootstrapping Python 3, pyparsing needs to be rebuilt before sphinx
%bcond_with doc %bcond_with doc
Summary: %{_summary} Summary: Python package with an object-oriented approach to text processing
Name: python3x-pyparsing Name: python3x-pyparsing
Version: 2.4.7 Version: 2.4.5
Release: 5%{?dist} Release: 3%{?dist}
License: MIT License: MIT
URL: https://github.com/pyparsing/pyparsing URL: https://github.com/pyparsing/pyparsing
@ -22,18 +21,13 @@ BuildArch: noarch
# x86_64 compose of CRB, but we don't want to ship it at all. # x86_64 compose of CRB, but we don't want to ship it at all.
# See: https://projects.engineering.redhat.com/browse/RCM-72605 # See: https://projects.engineering.redhat.com/browse/RCM-72605
ExcludeArch: i686 ExcludeArch: i686
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-rpm-macros
BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python%{python3_pkgversion}-rpm-macros
# python3 bootstrap: this is rebuilt before the final build of python3, which
# adds the dependency on python3-rpm-generators, so we require it manually
BuildRequires: python3-rpm-generators
%if %{with doc} %if %{with doc}
BuildRequires: python3-sphinx BuildRequires: python%{python3_pkgversion}-sphinx
%endif %endif
%if 0%{?build_wheel} %if 0%{?build_wheel}
@ -56,7 +50,7 @@ The package contains documentation for pyparsing.
%package -n python%{python3_pkgversion}-pyparsing %package -n python%{python3_pkgversion}-pyparsing
Summary: %{_summary} Summary: %{summary}
%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
%description -n python%{python3_pkgversion}-pyparsing %description -n python%{python3_pkgversion}-pyparsing
@ -83,7 +77,7 @@ dos2unix -k CHANGES LICENSE
pushd docs pushd docs
# Theme is not available # Theme is not available
sed -i '/alabaster/d' conf.py sed -i '/alabaster/d' conf.py
sphinx-build-3 -b html . html sphinx-build -b html . html
popd popd
%endif %endif
@ -115,30 +109,11 @@ popd
%changelog %changelog
* Tue Jan 12 2021 Tomas Orsava <torsava@redhat.com> - 2.4.7-5 * Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 2.4.5-3
- Convert from Fedora to the python39 module in RHEL8 - Exclude unsupported i686 arch
- Resolves: rhbz#1877430
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.7-4 * Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 2.4.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Adjusted for Python 3.8 module in RHEL 8
* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 2.4.7-3
- Rebuilt for Python 3.9
* Thu May 21 2020 Miro Hrončok <mhroncok@redhat.com> - 2.4.7-2
- Bootstrap for Python 3.9
* Mon Apr 06 2020 Dan Horák <dan[at]danny.cz> - 2.4.7-1
- Update to 2.4.7 (#1821085)
* Mon Mar 30 2020 David King <amigadave@amigadave.com> - 2.4.6-3
- Fix the summary for the Python 3 subpackage
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jan 03 2020 Dan Horák <dan[at]danny.cz> - 2.4.6-1
- Update to 2.4.6 (#1786815)
* Fri Nov 15 2019 Dan Horák <dan[at]danny.cz> - 2.4.5-1 * Fri Nov 15 2019 Dan Horák <dan[at]danny.cz> - 2.4.5-1
- Update to 2.4.5 (#1768725) - Update to 2.4.5 (#1768725)