also conflict also on 42.3

OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=30
2018-04-12 06:37:58 +00:00
parent 83f09c5dab
commit 019c571a19
1 changed files with 4 additions and 1 deletions
--- a/FreeCAD.spec
+++ b/FreeCAD.spec
@@ -68,6 +68,10 @@ BuildRequires:  hdf5-1_8-devel
 BuildRequires:  libXerces-c-devel
 BuildRequires:  pkg-config

+# reported to break FreeCAD here
+# https://forum.freecadweb.org/viewtopic.php?t=24610
+Conflicts:      python-pivy
+
 %if 0%{?suse_version} >= 1330
 # Qt5 & python3
 BuildRequires:  openmpi2-devel
@@ -89,7 +93,6 @@ Requires:       python3-pyside2
 # core dump if PySide is installed
 Conflicts:      python3-pyside
 Conflicts:      python-pyside
-Conflicts:      python-pivy
 %else
 BuildRequires:  libshiboken-devel
 BuildRequires:  python-CXX-devel