Fix FTBFS due to Python 3.8 confusion

Since Python 3.8 and Python 3.6 packages are both providing
python3dist(…), BuildRequires of this form have become broken.
This commit is contained in:
Benjamin A. Beasley 2022-07-28 22:10:44 -04:00
commit 26d11c7309

View file

@ -19,16 +19,16 @@ Source0: https://github.com/geopython/OWSLib/archive/%{version}/OWSLib-%{
BuildArch: noarch
BuildRequires: python3-devel
BuildRequires: python%{python3_pkgversion}-devel
# requirements.txt:
BuildRequires: python3dist(python-dateutil) >= 1.5
BuildRequires: python3dist(pytz)
BuildRequires: python3dist(requests) >= 1.0
BuildRequires: python3dist(pyproj) >= 2
BuildRequires: python3dist(pyyaml)
BuildRequires: python%{python3_pkgversion}-dateutil >= 1.5
BuildRequires: python%{python3_pkgversion}-pytz
BuildRequires: python%{python3_pkgversion}-requests >= 1.0
BuildRequires: python%{python3_pkgversion}-pyproj >= 2
BuildRequires: python%{python3_pkgversion}-pyyaml
# python_version < '3.7':
BuildRequires: python3dist(dataclasses)
BuildRequires: python%{python3_pkgversion}-dataclasses
# requirements-dev.txt
# flake8
@ -39,21 +39,21 @@ BuildRequires: python3dist(dataclasses)
# coveralls
# tox
%if %{with tests}
BuildRequires: python3dist(pytest) >= 3.8
BuildRequires: python%{python3_pkgversion}-pytest >= 3.8
%endif
%if %{with doc_pdf}
BuildRequires: make
BuildRequires: python3-sphinx-latex
BuildRequires: python%{python3_pkgversion}-sphinx-latex
BuildRequires: latexmk
BuildRequires: pandoc
# requirements-dev.txt
BuildRequires: python3dist(sphinx)
BuildRequires: python3dist(Pillow)
BuildRequires: python3dist(nbsphinx)
BuildRequires: python3dist(ipykernel)
BuildRequires: python3dist(nbconvert)
BuildRequires: python3dist(pandoc)
BuildRequires: python%{python3_pkgversion}-sphinx
BuildRequires: python%{python3_pkgversion}-Pillow
BuildRequires: python%{python3_pkgversion}-nbsphinx
BuildRequires: python%{python3_pkgversion}-ipykernel
BuildRequires: python%{python3_pkgversion}-nbconvert
BuildRequires: python%{python3_pkgversion}-pandoc
%endif
%global common_description %{expand: \
@ -70,13 +70,13 @@ numerous OGC Web Service interfaces.}
%{common_description}
%package -n python3-OWSLib
%package -n python%{python3_pkgversion}-OWSLib
Summary: %{summary}
%py_provides python3-OWSLib
%py_provides python3-owslib
%py_provides python%{python3_pkgversion}-OWSLib
%py_provides python%{python3_pkgversion}-owslib
%description -n python3-OWSLib
%description -n python%{python3_pkgversion}-OWSLib
%{common_description}
@ -234,7 +234,7 @@ PYTHONPATH='%{buildroot}%{python3_sitelib}' '%{python3}' -m pytest \
%endif
%files -n python3-OWSLib
%files -n python%{python3_pkgversion}-OWSLib
%license LICENSE
%doc AUTHORS.rst