From c79a12d20a5c707b5f7a6d0192df13668d807736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Sat, 20 Feb 2021 11:52:02 +0000
Subject: [PATCH] Fix %python_extras_subpkg with underscores in extras names

Fixes https://lists.fedoraproject.org/archives/list/packaging@lists.fedoraproject.org/thread/FI6J7JNKIOYGBYIN5UJVWYG24UIIES2U/
---
 macros.python-srpm     |  2 +-
 python-rpm-macros.spec |  5 ++++-
 tests/test_evals.py    | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/macros.python-srpm b/macros.python-srpm
index f19ee45..c5935f9 100644
--- a/macros.python-srpm
+++ b/macros.python-srpm
@@ -198,7 +198,7 @@
         rpm.expand('%{error:%%%0 requires at least one argument with "extras" name}')
     end
     local requires = 'Requires: ' .. value_n .. ' = %{?epoch:%{epoch}:}%{version}-%{release}'
-    for extras in args:gmatch('%w+') do
+    for extras in args:gmatch('%S+') do
         local rpmname = value_n .. '+' .. extras
         local pkgdef = '%package -n ' .. rpmname
         local summary = 'Summary: Metapackage for ' .. value_n .. ': ' .. extras .. ' extras'
diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec
index 4e79fd2..2cca632 100644
--- a/python-rpm-macros.spec
+++ b/python-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           python-rpm-macros
 Version:        3.9
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        The common Python RPM macros
 
 # macros and lua: MIT, compileall2.py: PSFv2
@@ -107,6 +107,9 @@ install -m 644 compileall2.py %{buildroot}%{_rpmconfigdir}/redhat/
 
 
 %changelog
+* Sat Feb 20 2021 Miro Hrončok <mhroncok@redhat.com> - 3.9-14
+- Fix %%python_extras_subpkg with underscores in extras names
+
 * Fri Feb 05 2021 Miro Hrončok <mhroncok@redhat.com> - 3.9-13
 - Automatically word-wrap the description of extras subpackages
 - Fixes: rhbz#1922442
diff --git a/tests/test_evals.py b/tests/test_evals.py
index 0c802c1..6904caa 100644
--- a/tests/test_evals.py
+++ b/tests/test_evals.py
@@ -409,6 +409,21 @@ def test_python_extras_subpkg_F():
     assert lines == expected
 
 
+def test_python_extras_subpkg_underscores():
+    lines = rpm_eval('%python_extras_subpkg -n python3-webscrapbook -F adhoc_ssl',
+                     version='0.33.3', release='1.fc33')
+    expected = textwrap.dedent(f"""
+        %package -n python3-webscrapbook+adhoc_ssl
+        Summary: Metapackage for python3-webscrapbook: adhoc_ssl extras
+        Requires: python3-webscrapbook = 0.33.3-1.fc33
+        %description -n python3-webscrapbook+adhoc_ssl
+        This is a metapackage bringing in adhoc_ssl extras requires for
+        python3-webscrapbook.
+        It contains no code, just makes sure the dependencies are installed.
+        """).lstrip().splitlines()
+    assert lines == expected
+
+
 @pytest.mark.parametrize('basename_len', [1, 10, 30, 45, 78])
 @pytest.mark.parametrize('extra_len', [1, 13, 28, 52, 78])
 def test_python_extras_subpkg_description_wrapping(basename_len, extra_len):