From 7e5adc9c02f2fa2a97238178c2675ff9c1c8b2f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 4 Aug 2020 15:08:18 +0200 Subject: [PATCH] Fix a copy paste error in %pyproject_extras_subpkg definition Also, add a comment for unreadable RPM expression. This is a fixup of cb4e43c670b9e8c065375b985a0ac15b6bfa6e78 --- macros.pyproject | 3 ++- pyproject-rpm-macros.spec | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/macros.pyproject b/macros.pyproject index 1b0aa02..e4f3d62 100644 --- a/macros.pyproject +++ b/macros.pyproject @@ -50,7 +50,8 @@ fi } -%python_extras_subpkg(n:i:f:F) %{expand:%{?python_extras_subpkg:%{python_extras_subpkg%{?!-i:%{?!-f:%{?!-F: -f %{pyproject_ghost_distinfo}}}} %**}}} +# Note: the three times nested questionmarked -i -f -F pattern means: If none of those options was used -- in that case, we inject our own -f +%pyproject_extras_subpkg(n:i:f:F) %{expand:%{?python_extras_subpkg:%{python_extras_subpkg%{?!-i:%{?!-f:%{?!-F: -f %{pyproject_ghost_distinfo}}}} %**}}} %pyproject_save_files() %{expand:\\\ diff --git a/pyproject-rpm-macros.spec b/pyproject-rpm-macros.spec index 4dd03f1..7db19f4 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: 20%{?dist} +Release: 21%{?dist} # Macro files Source001: macros.pyproject @@ -101,6 +101,9 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856 %license LICENSE %changelog +* Tue Aug 04 2020 Miro Hrončok - 0-21 +- Actually implement %%pyproject_extras_subpkg + * Wed Jul 29 2020 Miro Hrončok - 0-20 - Implement %%pyproject_extras_subpkg