From b0ac650f5f064b041c2b9b5af4125dee17156a24bd0412fcc08ee22cb012a111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Wed, 31 Jul 2019 20:18:15 +0000 Subject: [PATCH] Accepting request 719276 from home:StefanBruens:branches:science - Fix inverted logic when evaluating test suite exit code - Add gmsh mesher to BuildRequires, increase FEM test coverage - Remove MPI dependencies, as these are not used for the built package, but adversely affect build times and rebuilds. Proper MPI integration needs more work and has to ensure the base version of FreeCAD can be used without prior manual setup of an MPI environment. Remove 0001-find-openmpi2-include-files.patch, mpicc/mpicxx would pick up the correct include path by themselfs. - Sort BuildRequires: again OBS-URL: https://build.opensuse.org/request/show/719276 OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=91 --- 0001-find-openmpi2-include-files.patch | 13 ------------- FreeCAD-test.changes | 6 ++++++ FreeCAD-test.spec | 3 ++- FreeCAD.changes | 11 +++++++++++ FreeCAD.spec | 11 ++++------- 5 files changed, 23 insertions(+), 21 deletions(-) delete mode 100644 0001-find-openmpi2-include-files.patch diff --git a/0001-find-openmpi2-include-files.patch b/0001-find-openmpi2-include-files.patch deleted file mode 100644 index 24d6e78..0000000 --- a/0001-find-openmpi2-include-files.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3ecfe23a6..1db9bf33e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -717,7 +717,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - add_compile_options(${OPENMPI_CFLAGS}) - link_directories(${OPENMPI_LIBRARY_DIRS}) - link_libraries(${OPENMPI_LIBRARIES}) -- find_file(MpidotH mpi.h PATHS ${OPENMPI_INCLUDE_DIRS} NO_DEFAULT_PATH) -+ find_file(MpidotH mpi.h PATHS ${OPENMPI_INCLUDE_DIRS} /usr/lib64/mpi/gcc/openmpi2/include NO_DEFAULT_PATH) - if(NOT MpidotH) - message( WARNING "mpi.h was not found. Check for error above.") - endif() diff --git a/FreeCAD-test.changes b/FreeCAD-test.changes index e62a88a..05c1637 100644 --- a/FreeCAD-test.changes +++ b/FreeCAD-test.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 27 03:34:10 UTC 2019 - Stefan Brüns + +- Fix inverted logic when evaluating test suite exit code +- Add gmsh mesher to BuildRequires, increase FEM test coverage + ------------------------------------------------------------------- Tue Feb 12 21:10:12 UTC 2019 - Adrian Schröter diff --git a/FreeCAD-test.spec b/FreeCAD-test.spec index 7045515..3160965 100644 --- a/FreeCAD-test.spec +++ b/FreeCAD-test.spec @@ -24,6 +24,7 @@ License: LGPL-2.0-or-later AND GPL-2.0-or-later Group: Productivity/Graphics/CAD Url: http://www.freecadweb.org/ BuildRequires: FreeCAD +BuildRequires: gmsh # Test suite fails on 32bit and I don't want to debug that anymore ExcludeArch: %ix86 %arm ppc s390 s390x @@ -34,7 +35,7 @@ This is just executing the test suite at build time. %build export LC_ALL="C.utf-8" file=`mktemp` -if FreeCAD --console --write-log --log-file="$file" --run-test 0; then +if ! FreeCAD --console --write-log --log-file="$file" --run-test 0; then cat "$file" exit 1 fi diff --git a/FreeCAD.changes b/FreeCAD.changes index 8de5540..bbe7d83 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -17,6 +17,17 @@ Thu Jul 18 11:01:30 UTC 2019 - Adrian Schröter * FEM: solver elmer tasks, Py3 decode fix * make OpenSCAD utilities working again with Py2 +------------------------------------------------------------------- +Fri Jul 12 22:23:09 UTC 2019 - Stefan Brüns + +- Remove MPI dependencies, as these are not used for the built package, + but adversely affect build times and rebuilds. + Proper MPI integration needs more work and has to ensure the base version + of FreeCAD can be used without prior manual setup of an MPI environment. + Remove 0001-find-openmpi2-include-files.patch, mpicc/mpicxx would + pick up the correct include path by themselfs. +- Sort BuildRequires: again + ------------------------------------------------------------------- Thu Jun 13 12:25:02 UTC 2019 - Christophe Giboudeaux diff --git a/FreeCAD.spec b/FreeCAD.spec index 0cc6d51..c5bbdc9 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -39,13 +39,13 @@ Source0: %{name}-%version.tar.xz Source1: FreeCAD.sh Source2: FreeCADCmd.sh Source3: FreeCAD_shared_mimeinfo -Patch0: 0001-find-openmpi2-include-files.patch # PATCH-FIX-UPSTREAM 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch -- Fix build with shiboken2/pyside2 >= 5.12.1 Patch1: 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch # Test suite fails on 32bit and I don't want to debug that anymore ExcludeArch: %ix86 %arm ppc s390 s390x +BuildRequires: Coin-devel %if 0%{?suse_version} >= 1330 BuildRequires: libboost_filesystem-devel >= 1.55 BuildRequires: libboost_graph-devel >= 1.55 @@ -73,25 +73,22 @@ BuildRequires: gcc-fortran BuildRequires: git BuildRequires: glew-devel BuildRequires: graphviz -BuildRequires: hdf5-openmpi-devel +BuildRequires: hdf5-devel # We use the internal smesh version with fixes atm #BuildRequires: smesh-devel BuildRequires: libXerces-c-devel +BuildRequires: libXi-devel BuildRequires: libmed-devel -BuildRequires: netgen-devel - BuildRequires: libspnav-devel BuildRequires: make +BuildRequires: netgen-devel # we use upstream OpenCASCADE instead of oce-devel atm -BuildRequires: Coin-devel -BuildRequires: libXi-devel BuildRequires: occt-devel BuildRequires: opencv-devel BuildRequires: pkg-config %if 0%{?suse_version} >= 1330 # Qt5 & python3 -BuildRequires: openmpi2-devel BuildRequires: python3-devel BuildRequires: python3-matplotlib BuildRequires: python3-pyside2-devel