diff --git a/FreeCAD-0.18.1.obscpio b/FreeCAD-0.18.1.obscpio deleted file mode 100644 index 1d87619..0000000 --- a/FreeCAD-0.18.1.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ddbbce2dc1f06a7239e343e1478ab44d6c45d49d47cff7587457e66f69c84ec2 -size 427612686 diff --git a/FreeCAD-0.18.2.obscpio b/FreeCAD-0.18.2.obscpio new file mode 100644 index 0000000..b2b1666 --- /dev/null +++ b/FreeCAD-0.18.2.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f18c34b14280957cd8d10b85f81c552aa8fed975eb67ddc916a2c613052a8b05 +size 427612174 diff --git a/FreeCAD-test.spec b/FreeCAD-test.spec index c336d46..0eb76cf 100644 --- a/FreeCAD-test.spec +++ b/FreeCAD-test.spec @@ -17,7 +17,7 @@ Name: FreeCAD-test -Version: 0.18.1 +Version: 0.18.2 Release: 0 Summary: Meta source package that runs the FreeCAD testsuite when built License: LGPL-2.0-or-later AND GPL-2.0-or-later @@ -33,7 +33,10 @@ This is just executing the test suite at build time. %build export LC_ALL="C.utf-8" -#FreeCAD --console --write-log --log-file=/tmp/FreeCAD.log --run-test 0 || exit 1 -FreeCAD --console --run-test 0 || exit 1 +file=`mktemp` +if FreeCAD --console --write-log --log-file="$file" --run-test 0; then + cat "$file" + exit 1 +fi %changelog diff --git a/FreeCAD.obsinfo b/FreeCAD.obsinfo index 6f74828..f161c11 100644 --- a/FreeCAD.obsinfo +++ b/FreeCAD.obsinfo @@ -1,5 +1,5 @@ name: FreeCAD -version: 0.18.1 -mtime: 1554385363 -commit: f7dccfaa909e5b9da26bf50c4a22ccca9bb10c40 +version: 0.18.2 +mtime: 1557572575 +commit: dbb4cc6415bac848a294f03b80f65e888d531742 diff --git a/FreeCAD.spec b/FreeCAD.spec index 8bbfe5b..e237f9f 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -27,7 +27,7 @@ %endif Name: FreeCAD -Version: 0.18.1 +Version: 0.18.2 Release: 0 Summary: General Purpose 3D CAD Modeler License: LGPL-2.0-or-later AND GPL-2.0-or-later @@ -70,6 +70,7 @@ BuildRequires: freeglut-devel BuildRequires: gcc-fortran BuildRequires: git BuildRequires: glew-devel +BuildRequires: graphviz BuildRequires: hdf5-openmpi-devel # We use the internal smesh version with fixes atm #BuildRequires: smesh-devel @@ -100,8 +101,7 @@ BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5ScriptTools) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5UiTools) -BuildRequires: pkgconfig(Qt5WebKit) -BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5WebEngine) BuildRequires: pkgconfig(Qt5X11Extras) Requires: python3-numpy Requires: python3-pyside2 @@ -208,12 +208,13 @@ cmake \ -DSHIBOKEN_INCLUDE_DIR=/usr/include/shiboken2/ \ -DPYSIDE_INCLUDE_DIR=/usr/include/PySide2/ \ -DBUILD_QT5=ON \ + -DFREECAD_USE_QTWEBMODULE="Qt WebEngine" \ %endif -DFREECAD_USE_EXTERNAL_PIVY:BOOL=TRUE \ -DBUILD_MESH_PART:BOOL=ON \ -DBUILD_OPENSCAD:BOOL=ON \ -DBUILD_FEM:BOOL=ON \ - -DBUILD_FEM_NETGEN:BOOL=OFF \ + -DBUILD_FEM_NETGEN:BOOL=ON \ -DFREECAD_USE_EXTERNAL_SMESH=OFF \ .. diff --git a/_service b/_service index 5821fe7..c0e5929 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ https://github.com/FreeCAD/FreeCAD.git git - 0.18.1 - 0.18.1 + 0.18.2 + 0.18.2