Add missing bundled provide - ordered-set

This commit is contained in:
Lumir Balhar 2021-06-18 07:08:12 +02:00
parent 1be35ccff5
commit e02f56e26e

View File

@ -33,6 +33,7 @@ Release: 4%{?dist}
Summary: Easily build and distribute Python packages Summary: Easily build and distribute Python packages
# setuptools is MIT # setuptools is MIT
# appdirs is MIT # appdirs is MIT
# ordered-set is MIT
# packaging is BSD or ASL 2.0 # packaging is BSD or ASL 2.0
# pyparsing is MIT # pyparsing is MIT
# the setuptools logo has unknown license and possible TM problems, # the setuptools logo has unknown license and possible TM problems,
@ -75,10 +76,14 @@ This package also contains the runtime components of setuptools, necessary to
execute the software that requires pkg_resources. execute the software that requires pkg_resources.
# Virtual provides for the packages bundled by setuptools. # Virtual provides for the packages bundled by setuptools.
# You can generate it with: # Bundled packages are defined in two files:
# %%{_rpmconfigdir}/pythonbundles.py --namespace 'python%%{python3_pkgversion}dist' pkg_resources/_vendor/vendored.txt # - pkg_resources/_vendor/vendored.txt, and
# - setuptools/_vendor/vendored.txt
# Merge them to one and then generate the list with:
# %%{_rpmconfigdir}/pythonbundles.py --namespace 'python%%{python3_pkgversion}dist' allvendor.txt
%global bundled %{expand: %global bundled %{expand:
Provides: bundled(python%{python3_pkgversion}dist(appdirs)) = 1.4.3 Provides: bundled(python%{python3_pkgversion}dist(appdirs)) = 1.4.3
Provides: bundled(python%{python3_pkgversion}dist(ordered-set)) = 3.1.1
Provides: bundled(python%{python3_pkgversion}dist(packaging)) = 20.4 Provides: bundled(python%{python3_pkgversion}dist(packaging)) = 20.4
Provides: bundled(python%{python3_pkgversion}dist(pyparsing)) = 2.2.1 Provides: bundled(python%{python3_pkgversion}dist(pyparsing)) = 2.2.1
} }
@ -171,7 +176,8 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
%if %{with tests} %if %{with tests}
%check %check
# Verify bundled provides are up to date # Verify bundled provides are up to date
%{_rpmconfigdir}/pythonbundles.py pkg_resources/_vendor/vendored.txt --compare-with '%{bundled}' cat pkg_resources/_vendor/vendored.txt setuptools/_vendor/vendored.txt > allvendor.txt
%{_rpmconfigdir}/pythonbundles.py allvendor.txt --compare-with '%{bundled}'
# Regression test, the wheel should not be larger than 600 KiB # Regression test, the wheel should not be larger than 600 KiB
# https://bugzilla.redhat.com/show_bug.cgi?id=1914481#c3 # https://bugzilla.redhat.com/show_bug.cgi?id=1914481#c3