diff --git a/0001-find-openmpi2-include-files.patch b/0001-find-openmpi2-include-files.patch new file mode 100644 index 0000000..24d6e78 --- /dev/null +++ b/0001-find-openmpi2-include-files.patch @@ -0,0 +1,13 @@ +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.changes b/FreeCAD.changes index 63ada6c..4ce6b0c 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Mar 18 12:34:53 UTC 2019 - Adrian Schröter + +- Update to release 0.18 + * NetGen FEM enabled +- Obsolete patches: + * 0001-Convert-deprecated-boost-signal-to-signals2.patch + * 0001-Use-GL_RGB32F-instead-of-GL_RGB32F_ARB.patch + * 0002-move-from-deprecated-boost.signals-to-boost.signals2.patch + * 0003-fix-blocking-of-SelectionObserver.patch + * fix-build-with-Qt5_11.diff + * fix-build.diff + * fix-draft-module-with-python3.patch + * fix-gcc8-build-failure.patch + * get-rid-of-private-function-_PyImport_FixupBuiltin-for-FreeCAD-and-FreeCADGui-modules.patch + * get-rid-of-private-function-_PyImport_FixupBuiltin-for-__FreeCADBase__-module.patch + + ------------------------------------------------------------------- Thu Mar 14 03:36:03 UTC 2019 - Stefan Brüns diff --git a/FreeCAD.spec b/FreeCAD.spec index 6b022f2..bb0e9eb 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -35,8 +35,7 @@ Source0: %{name}-%version.tar.xz Source1: FreeCAD.sh Source2: FreeCADCmd.sh Source3: FreeCAD_shared_mimeinfo -# python3 and generic compile fixes -#Patch1: fix-build.diff +Patch2: 0001-find-openmpi2-include-files.patch # Test suite fails on 32bit and I don't want to debug that anymore ExcludeArch: %ix86 %arm ppc s390 s390x @@ -76,7 +75,7 @@ BuildRequires: fdupes BuildRequires: freeglut-devel BuildRequires: gcc-fortran BuildRequires: git -BuildRequires: hdf5-devel +BuildRequires: hdf5-openmpi-devel #BuildRequires: smesh-devel BuildRequires: libXerces-c-devel BuildRequires: libmed-devel @@ -90,6 +89,7 @@ BuildRequires: pkg-config %if 0%{?suse_version} >= 1330 # Qt5 & python3 +BuildRequires: openmpi2-devel BuildRequires: python3-devel BuildRequires: python3-matplotlib BuildRequires: python3-pyside2-devel @@ -161,8 +161,7 @@ Requires: %{name} = %{version} This package contains the files needed for development with FreeCAD. %prep -%autosetup -# -p1 +%autosetup -p1 # fix env-script-interpreter sed -i '1c#!%{__python2}' \