Hello community, here is the log from the commit of package openEMS for openSUSE:Factory checked in at 2018-12-19 13:50:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openEMS (Old) and /work/SRC/openSUSE:Factory/.openEMS.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openEMS" Wed Dec 19 13:50:43 2018 rev:11 rq:658622 version:0.0.35 Changes: -------- --- /work/SRC/openSUSE:Factory/openEMS/openEMS.changes 2018-06-27 10:23:06.548344758 +0200 +++ /work/SRC/openSUSE:Factory/.openEMS.new.28833/openEMS.changes 2018-12-19 13:50:51.279165134 +0100 @@ -1,0 +2,9 @@ +Sat Dec 15 12:41:00 UTC 2018 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Update 0001-Fix-linking-for-VTK-6.3.patch, avoid pulling in dependencies + of unused VTK modules during build. +- Drop MPI environment setup, VTK no longer depends on MPI. +- Do not force AVX for x86, SSE is sufficient for XMM intrinsics +- specfile cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openEMS.spec ++++++ --- /var/tmp/diff_new_pack.wgSj8o/_old 2018-12-19 13:50:52.135163949 +0100 +++ /var/tmp/diff_new_pack.wgSj8o/_new 2018-12-19 13:50:52.143163938 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -57,12 +57,8 @@ BuildRequires: boost-devel %endif BuildRequires: octave-devel -BuildRequires: python3-vtk -BuildRequires: sz2-devel BuildRequires: tinyxml-devel BuildRequires: vtk-devel -BuildRequires: vtk-java -BuildRequires: vtk-tcl BuildRequires: cmake(Qt5Sql) BuildRequires: cmake(Qt5Widgets) BuildRequires: pkgconfig(fparser) @@ -174,13 +170,10 @@ popd %build -if [ -f %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh ]; then - source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh -fi - %ifarch %ix86 -export CFLAGS="%{optflags} -mavx" -export CXXFLAGS="%{optflags} -mavx" +# Required for XMM intrinsics +export CFLAGS="%{optflags} -msse" +export CXXFLAGS="%{optflags} -msse" %endif %ifnarch %ix86 x86_64 # Always handle subnormals according to IEEE754 (gradual underflow), @@ -188,10 +181,9 @@ # a performance impact, arch specific code for non-x86 should be used. export CXXFLAGS="%{optflags} -DSSE_CORRECT_DENORMALS" %endif -export CXX=`which mpic++` %cmake -make %{?_smp_mflags} +%make_jobs cd .. pushd octave_build @@ -220,32 +212,27 @@ %octave --eval "pkg rebuild" %files -%defattr(-,root,root,-) -%doc COPYING NEWS README +%license COPYING +%doc NEWS README %{_bindir}/* %files -n libnf2ff0 -%defattr(-,root,root,-) %{_libdir}/libnf2ff.so.* %files -n libopenEMS0 -%defattr(-,root,root,-) %{_libdir}/libopenEMS.so.* %files devel -%defattr(-,root,root,-) %dir %{_prefix}/include/%{name} %{_prefix}/include/%{name}/* %{_libdir}/libnf2ff.so %{_libdir}/libopenEMS.so %files -n octave-%{name} -%defattr(-,root,root,-) %{octpackages_dir}/%{octpkg}-%{version} %{octlib_dir}/%{octpkg}-%{version} %files -n %{name}-matlab -%defattr(-,root,root,-) %dir %{_datadir}/%{name} %{_datadir}/%{name}/matlab/ ++++++ 0001-Fix-linking-for-VTK-6.3.patch ++++++ --- /var/tmp/diff_new_pack.wgSj8o/_old 2018-12-19 13:50:52.155163921 +0100 +++ /var/tmp/diff_new_pack.wgSj8o/_new 2018-12-19 13:50:52.159163915 +0100 @@ -1,29 +1,29 @@ -From 01bdfd13af101a9cd1f6d895eefcad39f38aa6bb Mon Sep 17 00:00:00 2001 +From d6daf5b062be05db00949b4097a46c9eb9b5531f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkae...@suse.de> Date: Wed, 27 Dec 2017 08:33:21 +0100 -Subject: [PATCH 1/6] Fix linking for VTK >= 6.3 +Subject: [PATCH] Fix linking for VTK >= 6.3 --- - CMakeLists.txt | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 898f28008c11..032f53fce782 100644 +index 898f280..2e860b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -125,11 +125,7 @@ find_package(Boost 1.46 COMPONENTS +@@ -125,8 +125,11 @@ find_package(Boost 1.46 COMPONENTS if (WIN32) find_package(VTK 6.1 REQUIRED) else() -- # prefer >=6.1, fallback to >=5.4 ++ find_package(VTK COMPONENTS vtkIOXML vtkIOGeometry vtkIOLegacy vtkIOPLY NO_MODULE) + # prefer >=6.1, fallback to >=5.4 - find_package(VTK 6.1 COMPONENTS vtkIOXML vtkIOGeometry vtkIOLegacy vtkIOPLY NO_MODULE) -- IF (NOT ${VTK_FOUND}) -- find_package(VTK REQUIRED) -- endif() -+ find_package(VTK REQUIRED) - endif() - - message(STATUS "Found package VTK. Using version " ${VTK_VERSION}) ++ IF (NOT ${VTK_FOUND}) ++ find_package(VTK 6.1 COMPONENTS vtkIOXML vtkIOGeometry vtkIOLegacy vtkIOPLY NO_MODULE) ++ endif() + IF (NOT ${VTK_FOUND}) + find_package(VTK REQUIRED) + endif() -- -2.15.1 +2.19.2
