From 019c571a1997bc06ac5410a32bd1ad2b4e140330d4311115e459c12052a8dacc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian.schroeter@suse.com>
Date: Thu, 12 Apr 2018 06:37:58 +0000
Subject: [PATCH] also conflict also on 42.3

OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=30
---
 FreeCAD.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/FreeCAD.spec b/FreeCAD.spec
index 2cf7b4f..cab4a2a 100644
--- 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