From d47bb9fc24610fa50b06e3f8eb77cf5a31e47ce2b74342945fb6460d38596d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Fri, 29 Dec 2017 09:33:44 +0000 Subject: [PATCH] Accepting request 560498 from home:kwk:branches:science - fix Factory build, add -pthread to CMAKE_CXX_FLAGS - fix Leap build, use correct RPATH (lib vs lib64) - added cadabra2-2.1.7.patch - Update to version 2.1.7: * Another interim release to fix bugs and sort out the build process on new distros. - Update to version 2.1.5: * Interim release to get a number of bug fixes out to everyone, and to use as basis for binary packages for several new distributions. - Drop cadabra2-cmake-error.patch; fixed upstream. - Fix Group for cadabra2-doc-pdf: Documentation/PDF doesn't exist, use Documentation/Other - Change hashbang "/usr/bin/env python3" to "/usr/bn/python3". - Refresh source tarball from upstream: upstream might have pushed out a new tarball without changes to the versioning, making the source validator service complain about the mismatch. - Update to version 2.1.5: * Interim release with as its main feature the map_sympy command which makes it much easier to apply sympy algorithms to component expressions. - Drop cadabra2-include-functional-header.patch; fixed upstream. - Add an appdata file and install it to /usr/share/metainfo; BuildRequires on appstream-glib added. - Add cadabra2-include-functional-header.patch: Explicitly include the header in core/Functional.hh to fix building on openSUSE > 1320; apply without conditionals as it doesn't hurt to have this generally. - BuildRequires: texlive-epstopdf instead of texlive-epstopdf-bin to fix build failures on Leap 42.1. - Update to version 2.1.4: * Enable packages to be written using Cadabra notation, instead of only pure Python (still experimental). * Young tableaux properties Tableau and FilledTableau the related algorithm lr_tensor are available again. * Sorting Majorana spinors possible again using sort_spinors. * Extended rename_dummies with capability to rename indices to different set. * Make vary work on powers of expressions with dummy indices. * Substitution of sub-sums now available (e.g. substitute of A+B=C in ex:=A+B+C+D). * Improved LaTeX export to make printed notebooks look much better. * Many improvements to the component engine, in particular for handling of derivatives and fractions involving tensors. * Better line spacing for line-wrapped equations. * Smarter scroll-to-cell behaviour of the notebook. * Canonicalising expressions with component values for indices now works again. * The unwrap algorithm can now be guided about what to unwrap, and also knows about spinors and Dirac bars. * Experimental support to use Cadabra directly from C++ code, as a library (see the c++lib directory). * Fixes for using a custom post_process defined as a function nested inside another. * Rudimentary timing logic, try server.totals(); * Fixed: pasting text in the notebook sometimes double-pastes. * Fixed: split_index does not work properly on left- and right-hand side of equations. * Fixed: sort_product does not always sort expressions. * Fixed: eliminate_metric only acts at top level of an expression, should have deep=True by default. * Fixed: a bug which would lead to a segfault when using deep=True. - Rebase cadabra2-cmake-error.patch for version update. - Add %{name}-rpmlintrc file to suppress warnings about the presence of "__DATE__" and/or "__TIME__" in generated html files for documentation (%{name}-doc). - Initial package. - Add cadabra2-cmake-error.patch to make sure CMakeLists.txt invokes "execute_process" instead of "execute"; fixes build failures. OBS-URL: https://build.opensuse.org/request/show/560498 OBS-URL: https://build.opensuse.org/package/show/science/cadabra2?expand=0&rev=13 --- cadabra2-2.1.7.patch | 12 ++++++++++++ cadabra2.changes | 8 +++++++- cadabra2.spec | 3 +++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 cadabra2-2.1.7.patch diff --git a/cadabra2-2.1.7.patch b/cadabra2-2.1.7.patch new file mode 100644 index 0000000..ca5220d --- /dev/null +++ b/cadabra2-2.1.7.patch @@ -0,0 +1,12 @@ +diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cadabra2-2.1.7/CMakeLists.txt ./CMakeLists.txt +--- ../orig-cadabra2-2.1.7/CMakeLists.txt 2017-11-19 20:27:27.000000000 +0100 ++++ ./CMakeLists.txt 2017-12-29 09:34:50.496366051 +0100 +@@ -202,7 +202,7 @@ + include(CPack) + + if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -pthread") + endif() + + if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") diff --git a/cadabra2.changes b/cadabra2.changes index 1a355a7..e81f0b6 100644 --- a/cadabra2.changes +++ b/cadabra2.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Fri Dec 29 08:33:37 UTC 2017 - kkaempf@suse.com + +- fix build, add -pthread to CMAKE_CXX_FLAGS + added cadabra2-2.1.7.patch + ------------------------------------------------------------------- Wed Nov 22 09:19:49 UTC 2017 - badshah400@gmail.com -- Update to version 2.1.6: +- Update to version 2.1.7: * Another interim release to fix bugs and sort out the build process on new distros. diff --git a/cadabra2.spec b/cadabra2.spec index 4367a64..050100d 100644 --- a/cadabra2.spec +++ b/cadabra2.spec @@ -26,6 +26,8 @@ Url: http://cadabra.science/ Source0: https://github.com/kpeeters/cadabra2/archive/%{version}.tar.gz Source1: %{name}-rpmlintrc Source2: %{name}-gtk.appdata.xml +# PATCH-FIX-OPENSUSE add -pthread to CMAKE_CXX_FLAGS (as adivised in https://github.com/potree/PotreeConverter/issues/136) kkaempf@suse.de +Patch1: cadabra2-2.1.7.patch BuildRequires: appstream-glib BuildRequires: cmake BuildRequires: doxygen @@ -161,6 +163,7 @@ This package provides documentation in the form of a PDF file for %{name}. %prep %setup -q +%patch1 -p1 %build mkdir build && pushd build