From ab4eb9e25ecd4764a0fa48ddad5802b0c2169085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Wed, 9 Dec 2020 19:42:29 +0100 Subject: [PATCH] Downstream workaround for the %fedora macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Šabata --- pyproject-rpm-macros.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pyproject-rpm-macros.spec b/pyproject-rpm-macros.spec index dfe4ac0..62a42fe 100644 --- a/pyproject-rpm-macros.spec +++ b/pyproject-rpm-macros.spec @@ -6,7 +6,7 @@ License: MIT # Keep the version at zero and increment only release Version: 0 -Release: 24%{?dist} +Release: 24.1%{?dist} # Macro files Source001: macros.pyproject @@ -36,7 +36,7 @@ BuildArch: noarch BuildRequires: python3dist(pytest) BuildRequires: python3dist(pyyaml) BuildRequires: python3dist(packaging) -%if 0%{fedora} < 32 +%if 0%{?fedora} < 32 # The %%if should not be needed, it works around: # https://github.com/rpm-software-management/mock/issues/336 BuildRequires: (python3dist(importlib-metadata) if python3 < 3.8) @@ -88,6 +88,9 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 %license LICENSE %changelog +* Wed Dec 09 2020 Petr Šabata - 0-24.1 +- Downstream workaround for the %%fedora macro + * Tue Aug 11 2020 Miro Hrončok - 0-24 - Allow multiple, comma-separated extras in %%pyproject_buildrequires -x