[projects/pld-builder.new] fix build conflicts processing

[atler]

commit b2679a62ed1f2713058222fdc1ce051dd250e648
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue May 25 23:58:30 2021 +0200

    fix build conflicts processing
    
    rpm.org appears to use <name>-<version>-<rel>.<arch> instead of
    <name>-<version>-<rel>.src. generalized last part to everything but dot
    and whitespace

 PLD_Builder/install.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/PLD_Builder/install.py b/PLD_Builder/install.py
index bed6c1d..d367da4 100644
--- a/PLD_Builder/install.py
+++ b/PLD_Builder/install.py
@@ -110,7 +110,8 @@ def uninstall_self_conflict(b):
     }, encoding = "utf-8")
     # java-sun >= 1.5 conflicts with soprano-2.1.67-1.src
     # java-sun conflicts with soprano-2.1.67-1.src
-    rx = re.compile(r"\s+(?P<name>[\w-]+)\s+.*conflicts with [^\s]+-[^-]+-[^-]+\.src($| .*)")
+    # plplot conflicts with plplot-5.15.0-4.x86_64
+    rx = re.compile(r"\s+(?P<name>[\w-]+)\s+.*conflicts with [^\s]+-[^-]+-[^-]+\.[^.\s]+($| .*)")
     conflicting = {}
     for l in f:
         m = rx.search(l)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/b2679a62ed1f2713058222fdc1ce051dd250e648