Use new macros %python_wheel_dir and %python_wheel_pkg_prefix
..for build/requiring wheel packages and for the file location. This does not actually change the name or the contents of the subpackage.
This commit is contained in:
parent
651691580e
commit
c4313879e7
@ -226,8 +226,8 @@ BuildRequires: /usr/bin/dtrace
|
|||||||
BuildRequires: /usr/sbin/ifconfig
|
BuildRequires: /usr/sbin/ifconfig
|
||||||
|
|
||||||
%if %{with rpmwheels}
|
%if %{with rpmwheels}
|
||||||
BuildRequires: python-setuptools-wheel
|
BuildRequires: %{python_wheel_pkg_prefix}-setuptools-wheel
|
||||||
BuildRequires: python-pip-wheel
|
BuildRequires: %{python_wheel_pkg_prefix}-pip-wheel
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{without bootstrap}
|
%if %{without bootstrap}
|
||||||
@ -425,8 +425,8 @@ This package contains /usr/bin/python - the "python" command that runs Python 3.
|
|||||||
Summary: Python runtime libraries
|
Summary: Python runtime libraries
|
||||||
|
|
||||||
%if %{with rpmwheels}
|
%if %{with rpmwheels}
|
||||||
Requires: python-setuptools-wheel
|
Requires: %{python_wheel_pkg_prefix}-setuptools-wheel
|
||||||
Requires: python-pip-wheel
|
Requires: %{python_wheel_pkg_prefix}-pip-wheel
|
||||||
%else
|
%else
|
||||||
Provides: bundled(python3dist(pip)) = %{pip_version}
|
Provides: bundled(python3dist(pip)) = %{pip_version}
|
||||||
Provides: bundled(python3dist(setuptools)) = %{setuptools_version}
|
Provides: bundled(python3dist(setuptools)) = %{setuptools_version}
|
||||||
@ -583,8 +583,8 @@ Provides: python%{pyshortver} = %{version}-%{release}
|
|||||||
Obsoletes: python%{pyshortver} < %{version}-%{release}
|
Obsoletes: python%{pyshortver} < %{version}-%{release}
|
||||||
|
|
||||||
%if %{with rpmwheels}
|
%if %{with rpmwheels}
|
||||||
Requires: python-setuptools-wheel
|
Requires: %{python_wheel_pkg_prefix}-setuptools-wheel
|
||||||
Requires: python-pip-wheel
|
Requires: %{python_wheel_pkg_prefix}-pip-wheel
|
||||||
%else
|
%else
|
||||||
Provides: bundled(python3dist(pip)) = %{pip_version}
|
Provides: bundled(python3dist(pip)) = %{pip_version}
|
||||||
Provides: bundled(python3dist(setuptools)) = %{setuptools_version}
|
Provides: bundled(python3dist(setuptools)) = %{setuptools_version}
|
||||||
@ -717,7 +717,7 @@ BuildPython() {
|
|||||||
--with-ssl-default-suites=openssl \
|
--with-ssl-default-suites=openssl \
|
||||||
--without-static-libpython \
|
--without-static-libpython \
|
||||||
%if %{with rpmwheels}
|
%if %{with rpmwheels}
|
||||||
--with-wheel-pkg-dir=%{_datadir}/python-wheels \
|
--with-wheel-pkg-dir=%{python_wheel_dir} \
|
||||||
%endif
|
%endif
|
||||||
%if %{with valgrind}
|
%if %{with valgrind}
|
||||||
--with-valgrind \
|
--with-valgrind \
|
||||||
|
Loading…
Reference in New Issue
Block a user