From 4c553c7f85f241832a2f48d03659b92087e89419af74bf05faba2c048957bccb Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Fri, 8 Jul 2022 15:28:14 +0000 Subject: [PATCH] Accepting request 986688 from home:badshah400:branches:science * Update to version 2.3.9.3 * Add cadabra2-link-python.patch: Link against python shared lib where necessary to avoid linking failures. OBS-URL: https://build.opensuse.org/request/show/986688 OBS-URL: https://build.opensuse.org/package/show/science/cadabra2?expand=0&rev=46 --- cadabra2-2.3.6.8.tar.gz | 3 -- cadabra2-2.3.9.3.tar.gz | 3 ++ cadabra2-disable-components-test.patch | 8 +++--- cadabra2-link-python.patch | 26 +++++++++++++++++ cadabra2.changes | 40 ++++++++++++++++++++++++++ cadabra2.spec | 8 ++++-- 6 files changed, 79 insertions(+), 9 deletions(-) delete mode 100644 cadabra2-2.3.6.8.tar.gz create mode 100644 cadabra2-2.3.9.3.tar.gz create mode 100644 cadabra2-link-python.patch diff --git a/cadabra2-2.3.6.8.tar.gz b/cadabra2-2.3.6.8.tar.gz deleted file mode 100644 index 1252414..0000000 --- a/cadabra2-2.3.6.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c23ff53b8d882c9bfd3df6480525d6b8ab54c9ba0bf876aacb8b842d09ec11b -size 24544755 diff --git a/cadabra2-2.3.9.3.tar.gz b/cadabra2-2.3.9.3.tar.gz new file mode 100644 index 0000000..bed030a --- /dev/null +++ b/cadabra2-2.3.9.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:288284535bd4b0165f436aa4d4908e98044d4f2def5f661261bb358f6888279e +size 24685603 diff --git a/cadabra2-disable-components-test.patch b/cadabra2-disable-components-test.patch index 1c56ed9..3504e5e 100644 --- a/cadabra2-disable-components-test.patch +++ b/cadabra2-disable-components-test.patch @@ -1,8 +1,8 @@ -Index: cadabra2-2.3.5/tests/CMakeLists.txt +Index: cadabra2-2.3.9.3/tests/CMakeLists.txt =================================================================== ---- cadabra2-2.3.5.orig/tests/CMakeLists.txt -+++ cadabra2-2.3.5/tests/CMakeLists.txt -@@ -68,7 +68,6 @@ set(RTESTS +--- cadabra2-2.3.9.3.orig/tests/CMakeLists.txt ++++ cadabra2-2.3.9.3/tests/CMakeLists.txt +@@ -69,7 +69,6 @@ set(RTESTS trigonometric noncovariant algebra diff --git a/cadabra2-link-python.patch b/cadabra2-link-python.patch new file mode 100644 index 0000000..391fd5f --- /dev/null +++ b/cadabra2-link-python.patch @@ -0,0 +1,26 @@ +Index: cadabra2-2.3.9.3/core/CMakeLists.txt +=================================================================== +--- cadabra2-2.3.9.3.orig/core/CMakeLists.txt ++++ cadabra2-2.3.9.3/core/CMakeLists.txt +@@ -284,7 +284,7 @@ target_link_libraries(cadabra2 PRIVATE + ${GMPXX_LIBRARIES} + ${GMP_LIBRARIES} + ${Boost_LIBRARIES} +-# ${PYTHON_LIBRARIES} ++ ${PYTHON_LIBRARIES} + # ${GLIBMM3_LIBRARIES} + ) + +Index: cadabra2-2.3.9.3/core/packages/CMakeLists.txt +=================================================================== +--- cadabra2-2.3.9.3.orig/core/packages/CMakeLists.txt ++++ cadabra2-2.3.9.3/core/packages/CMakeLists.txt +@@ -62,7 +62,7 @@ foreach(PACKAGE ${COMPILED_PACKAGES}) + pybind11_add_module(${PNAME} SHARED ${SOURCE_PACKAGEDIR}/${PACKAGE}) + set_target_properties(${PNAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/cdb/${PINSTALL}") + set_target_properties(${PNAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/cdb/${PINSTALL}") +- target_link_libraries(${PNAME} PUBLIC cadabra2 ${GMPXX_LIBRARIES}) ++ target_link_libraries(${PNAME} PUBLIC cadabra2 ${PYTHON_LIBRARIES} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES}) + target_include_directories(${PNAME} PUBLIC ${CADABRA_CORE_DIR}) + install(TARGETS ${PNAME} DESTINATION ${PYTHON_CDB_PACKAGE_PATH}/${PINSTALL}) + endforeach() diff --git a/cadabra2.changes b/cadabra2.changes index c67c04c..6c7c4ae 100644 --- a/cadabra2.changes +++ b/cadabra2.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Mon Jul 4 14:23:29 UTC 2022 - Atri Bhattacharya + +- Update to version 2.3.9.3 + * Several fixes to meld (Dominic). + * Make typesetting run in a separate thread to prevent the UI + from feeling sluggish. + * Some changes in the behaviour of list addition/multiplication, + to match Mathematica's behaviour. + * New nevaluate algorithm for fast numerical evaluation of + expressions (work-in-progress). + * Fix for Python 3.10.x. + * Fix for automatic cleanup of Diagonal objects. + * Fix crash with tab-completion. +- Changes from version 2.3.8: + * Option to display negative powers as fractions (Dominic). + * New algorithm slot_asym to (anti-)symmetrise objects in + indices by giving index positions instead of names. + * New functionality to implement algorithms in Python (Dominic). + * Faster re-implementation of get_component using new C++ + function modules (Dominic). + * New cdb.numeric.evaluate and cdb.numeric.integrate modules to + evaluate expressions numerically or integrate differential + equations numerically (Dominic). + * Updates to cdb.utils.indices and cdb.core.manip. + * Add warnings functionality to the kernel (Dominic). + * Add infrastructure to let algorithms display progress + information while running (Dominic). + * Add cell cursor position to status bar (Dominic). + * Fix bug in expand_delta when the delta occurs at top-level in + an expression. + * Many meld fixes and improvements (Dominic). + * Fix handling of auto-declare names (names with a '#' + character). + * Keep LaTeX log/aux files on error to aid debugging. + * Fix LaTeX code to avoid some global variable name clashes. + * Fix for compilation on Apple silicon. +- Add cadabra2-link-python.patch: Link against python shared lib + where necessary to avoid linking failures. + ------------------------------------------------------------------- Sun Feb 14 01:09:07 UTC 2021 - Atri Bhattacharya diff --git a/cadabra2.spec b/cadabra2.spec index 440a725..4f2daf0 100644 --- a/cadabra2.spec +++ b/cadabra2.spec @@ -1,7 +1,7 @@ # # spec file for package cadabra2 # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %bcond_without tests Name: cadabra2 -Version: 2.3.6.8 +Version: 2.3.9.3 Release: 0 Summary: A computer algebra system for solving problems in field theory License: GPL-3.0-or-later @@ -28,6 +28,8 @@ Source0: https://github.com/kpeeters/cadabra2/archive/%{version}.tar.gz#/ Source1: %{name}-gtk.appdata.xml # PATCH-FIX-UPSTREAM cadabra2-disable-components-test.patch gh#kpeeters/cadabra2#212 badshah400@gmail.com -- Disable a test that crashes for unknown reasons Patch0: cadabra2-disable-components-test.patch +# PATCH-FIX-UPSTREAM cadabra2-link-python.patch badshah400@gmail.com -- Link against python shared lib explicitly +Patch1: cadabra2-link-python.patch BuildRequires: appstream-glib BuildRequires: cmake BuildRequires: doxygen @@ -45,6 +47,7 @@ BuildRequires: libuuid-devel BuildRequires: pcre-devel BuildRequires: pkgconfig BuildRequires: python3-devel +BuildRequires: python3-gobject-devel BuildRequires: python3-ipykernel BuildRequires: python3-matplotlib BuildRequires: python3-sympy @@ -187,6 +190,7 @@ popd %{_bindir}/cadabra2cadabra %{_bindir}/cadabra2latex %{_bindir}/cadabra-server +%{_bindir}/cdb-nbtool %{_bindir}/%{name} %{_bindir}/%{name}-cli %{_bindir}/%{name}ipynb