From 90be9a52cea954960e49dcd8cc87f9f330ff9f53 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 30 2022 02:09:19 +0000 Subject: import python-rpm-macros-3-43.el8 --- diff --git a/SOURCES/macros.python3 b/SOURCES/macros.python3 index a87e33c..c8d2d9e 100644 --- a/SOURCES/macros.python3 +++ b/SOURCES/macros.python3 @@ -76,7 +76,7 @@ } # This is intended for Python 3 only, hence also no Python version in the name. -%__pytest /usr/bin/pytest-3 +%__pytest /usr/bin/pytest-%{_python3_pkgversion_with_dot} %pytest %{expand:\\\ CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\ PATH="%{buildroot}%{_bindir}:$PATH"\\\ diff --git a/SPECS/python-rpm-macros.spec b/SPECS/python-rpm-macros.spec index 2ebf4b6..f36d9b2 100644 --- a/SPECS/python-rpm-macros.spec +++ b/SPECS/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 42%{?dist} +Release: 43%{?dist} Summary: The unversioned Python RPM macros License: MIT @@ -43,6 +43,8 @@ Summary: RPM macros for building Python 3 packages Conflicts: platform-python-devel < 3.6.8-35 # For %%py_setup Requires: python-rpm-macros = %{version}-%{release} +# For %%_python3_pkgversion_with_dot needed by %%__pytest +Requires: python-srpm-macros = %{version}-%{release} %description -n python3-rpm-macros RPM macros for building Python 3 packages. @@ -73,6 +75,10 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ %changelog +* Tue Jul 26 2022 Tomas Orsava - 3-43 +- Make %%pytest macro respect %%python3_pkgversion +Resolves: rhbz#2091462 + * Wed May 25 2022 Miro HronĨok - 3-42 - Make %%py3_dist respect %%python3_pkgversion Resolves: rhbz#2090007