From 3dd337c506f52f5002a8b54abbc6830518125dbca42d8da1fd850b9ebd43eae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sat, 11 Aug 2018 12:28:38 +0000 Subject: [PATCH] fix deps OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=47 --- FreeCAD.obsinfo | 6 +++--- FreeCAD.spec | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/FreeCAD.obsinfo b/FreeCAD.obsinfo index 624d7ab..97a3e2a 100644 --- a/FreeCAD.obsinfo +++ b/FreeCAD.obsinfo @@ -1,5 +1,5 @@ name: FreeCAD -version: 0.17.1531488607.5c3f7bf8e -mtime: 1531488607 -commit: 5c3f7bf8ec51e2c7187789f7edba71a7aa82a88b +version: 0.17.1532854452.1bf6c6aa1 +mtime: 1532854452 +commit: 1bf6c6aa143447ae645c1eff96cf06d61b0d6eea diff --git a/FreeCAD.spec b/FreeCAD.spec index 1a778e5..da4490a 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -19,7 +19,7 @@ %define x_prefix %{_libdir}/%{name} Name: FreeCAD -Version: 0.17.1531488607.5c3f7bf8e +Version: 0.17.1532854452.1bf6c6aa1 Release: 0 Summary: General Purpose 3D CAD Modeler License: LGPL-2.0-or-later AND GPL-2.0-or-later @@ -73,10 +73,6 @@ BuildRequires: git 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 @@ -99,6 +95,9 @@ Requires: python3-pivy # core dump if PySide is installed Conflicts: python3-pyside Conflicts: python-pyside +# reported to break FreeCAD here +# https://forum.freecadweb.org/viewtopic.php?t=24610 +Conflicts: python-pivy %else BuildRequires: libshiboken-devel BuildRequires: python-CXX-devel @@ -107,6 +106,7 @@ BuildRequires: python-matplotlib BuildRequires: python-pyside-devel BuildRequires: python-pyside-tools BuildRequires: pkgconfig(QtWebKit) +Requires: python-pyside %if 0%{?suse_version} > 0 # Qt4 & python2 BuildRequires: libqt4-devel