rpm/FreeCAD
SHA256
1
0
Fork 0
forked from pool/FreeCAD
Code Pull Requests Activity

fix deps

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=47
This commit is contained in:
Adrian Schröter 2018-08-11 12:28:38 +00:00 committed by Git OBS Bridge
parent ea485c6791
commit 3dd337c506
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FreeCAD.obsinfo
View File

@ -1,5 +1,5 @@
name: FreeCAD name: FreeCAD
version: 0.17.1531488607.5c3f7bf8e version: 0.17.1532854452.1bf6c6aa1
mtime: 1531488607 mtime: 1532854452
commit: 5c3f7bf8ec51e2c7187789f7edba71a7aa82a88b commit: 1bf6c6aa143447ae645c1eff96cf06d61b0d6eea

10
FreeCAD.spec
View File

@ -19,7 +19,7 @@
%define x_prefix %{_libdir}/%{name} %define x_prefix %{_libdir}/%{name}
Name: FreeCAD Name: FreeCAD
Version: 0.17.1531488607.5c3f7bf8e Version: 0.17.1532854452.1bf6c6aa1
Release: 0 Release: 0
Summary: General Purpose 3D CAD Modeler Summary: General Purpose 3D CAD Modeler
License: LGPL-2.0-or-later AND GPL-2.0-or-later License: LGPL-2.0-or-later AND GPL-2.0-or-later
@ -73,10 +73,6 @@ BuildRequires: git
BuildRequires: libXerces-c-devel BuildRequires: libXerces-c-devel
BuildRequires: pkg-config BuildRequires: pkg-config
# reported to break FreeCAD here
# https://forum.freecadweb.org/viewtopic.php?t=24610
Conflicts: python-pivy
%if 0%{?suse_version} >= 1330 %if 0%{?suse_version} >= 1330
# Qt5 & python3 # Qt5 & python3
BuildRequires: openmpi2-devel BuildRequires: openmpi2-devel
@ -99,6 +95,9 @@ Requires: python3-pivy
# core dump if PySide is installed # core dump if PySide is installed
Conflicts: python3-pyside Conflicts: python3-pyside
Conflicts: python-pyside Conflicts: python-pyside
# reported to break FreeCAD here
# https://forum.freecadweb.org/viewtopic.php?t=24610
Conflicts: python-pivy
%else %else
BuildRequires: libshiboken-devel BuildRequires: libshiboken-devel
BuildRequires: python-CXX-devel BuildRequires: python-CXX-devel
@ -107,6 +106,7 @@ BuildRequires: python-matplotlib
BuildRequires: python-pyside-devel BuildRequires: python-pyside-devel
BuildRequires: python-pyside-tools BuildRequires: python-pyside-tools
BuildRequires: pkgconfig(QtWebKit) BuildRequires: pkgconfig(QtWebKit)
Requires: python-pyside
%if 0%{?suse_version} > 0 %if 0%{?suse_version} > 0
# Qt4 & python2 # Qt4 & python2
BuildRequires: libqt4-devel BuildRequires: libqt4-devel