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

diff --git a/PLD_Builder/install.py b/PLD_Builder/install.py
index bed6c1ddde5bb46cfd4a62fd85519b165280c3ab..d367da4c22f12642898baf5becc491efa01a928c 100644 (file)
--- 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)