From 49c77ba191d5c8f21a2b5e2a5ef926a59ea7c484 Mon Sep 17 00:00:00 2001
From: Paul Donohue <git@PaulSD.com>
Date: Jan 28 2021 17:33:41 +0000
Subject: Fix {dist} macro regex to support stream RPMs with + in {dist}


---

diff --git a/return_disttag.sh b/return_disttag.sh
index 0048cd6..e1b86aa 100755
--- a/return_disttag.sh
+++ b/return_disttag.sh
@@ -124,15 +124,15 @@ SPEC=$(cd SPECS; ls *.spec)
 mydist="XXXjsdf9ur7qlkasdh4gygXXX"
 test_nvr=$(build_with_dist_scl "SPECS/${SPEC}" ${mydist})
 
-test_nodist=$(echo ${test_nvr} | sed -e 's/-[a-zA-Z0-9\.]*$//')
-git_nodist=$(echo ${git_nvr} | sed -e 's/-[a-zA-Z0-9\._]*$//')
+test_nodist=$(echo ${test_nvr} | sed -e 's/-[a-zA-Z0-9.+]*$//')
+git_nodist=$(echo ${git_nvr} | sed -e 's/-[a-zA-Z0-9.+_]*$//')
 
 if [[ "${git_nodist}" != "${test_nodist}" ]]; then
     warn "Warning: ${git_nvr} != ${test_nvr}"
     warn "Warning: Trying as a Software Collection"
     scl=$(echo ${git_nodist} |sed -e "s/-${test_nodist}//")
     test_nvr=$(build_with_dist_scl "SPECS/${SPEC}" ${mydist} ${scl})
-    test_nodist=$(echo ${test_nvr} | sed -e 's/-[a-zA-Z0-9\.]*$//')
+    test_nodist=$(echo ${test_nvr} | sed -e 's/-[a-zA-Z0-9.+]*$//')
 fi
 
 if [[ "${git_nodist}" != "${test_nodist}" ]]; then