Dominique Leuenberger 2022-12-14 13:11:37 +00:00 committed by Git OBS Bridge
commit bffe828db6
5 changed files with 38 additions and 16 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a24c8636264f2278c16d4f2010ab92b497b292a3a5bc495557c70e457516e7fe
size 24688084

3
cadabra2-2.4.3.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ae913bb1f7d562ca479ff57adf0b61c4b2e9cf83a8b5ec282ef3d27050cfcca2
size 25157173

View File

@ -1,7 +1,7 @@
Index: cadabra2-2.3.9.3/core/CMakeLists.txt Index: cadabra2-2.4.3.2/core/CMakeLists.txt
=================================================================== ===================================================================
--- cadabra2-2.3.9.3.orig/core/CMakeLists.txt --- cadabra2-2.4.3.2.orig/core/CMakeLists.txt
+++ cadabra2-2.3.9.3/core/CMakeLists.txt +++ cadabra2-2.4.3.2/core/CMakeLists.txt
@@ -284,7 +284,7 @@ target_link_libraries(cadabra2 PRIVATE @@ -284,7 +284,7 @@ target_link_libraries(cadabra2 PRIVATE
${GMPXX_LIBRARIES} ${GMPXX_LIBRARIES}
${GMP_LIBRARIES} ${GMP_LIBRARIES}
@ -11,14 +11,15 @@ Index: cadabra2-2.3.9.3/core/CMakeLists.txt
# ${GLIBMM3_LIBRARIES} # ${GLIBMM3_LIBRARIES}
) )
Index: cadabra2-2.3.9.3/core/packages/CMakeLists.txt Index: cadabra2-2.4.3.2/core/packages/CMakeLists.txt
=================================================================== ===================================================================
--- cadabra2-2.3.9.3.orig/core/packages/CMakeLists.txt --- cadabra2-2.4.3.2.orig/core/packages/CMakeLists.txt
+++ cadabra2-2.3.9.3/core/packages/CMakeLists.txt +++ cadabra2-2.4.3.2/core/packages/CMakeLists.txt
@@ -62,7 +62,7 @@ foreach(PACKAGE ${COMPILED_PACKAGES}) @@ -66,8 +66,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 RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/cdb/${PINSTALL}")
set_target_properties(${PNAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/cdb/${PINSTALL}") set_target_properties(${PNAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/cdb/${PINSTALL}")
set_target_properties(${PNAME} PROPERTIES SUFFIX ".${PYTHON_MOD_SUFFIX}")
-
- target_link_libraries(${PNAME} PUBLIC cadabra2 ${GMPXX_LIBRARIES}) - target_link_libraries(${PNAME} PUBLIC cadabra2 ${GMPXX_LIBRARIES})
+ target_link_libraries(${PNAME} PUBLIC cadabra2 ${PYTHON_LIBRARIES} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES}) + target_link_libraries(${PNAME} PUBLIC cadabra2 ${PYTHON_LIBRARIES} ${GMPXX_LIBRARIES} ${GMP_LIBRARIES})
target_include_directories(${PNAME} PUBLIC ${CADABRA_CORE_DIR}) target_include_directories(${PNAME} PUBLIC ${CADABRA_CORE_DIR})

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Wed Dec 7 08:00:00 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>
- Update to version 2.4.3.2:
* Add missing canonicalisation of rationals when simplifying
powers.
-------------------------------------------------------------------
Tue Dec 6 12:54:33 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>
- Update to version 2.4.2.4:
* Minor update to fix issues with Python 3.11.
- Changes from version 2.4.2.0:
* Added package cdb.graphics.plot for easy plotting.
* Added package cdb.sympy.calculus for use of SymPy calculus
functions on Cadabra expressions.
* Expanded nevaluate to numerically evaluate more expressions.
* Various small bug fixes and enhancements.
- For %check, set working dir as HOME to allow tests that try to
write config files to home dir to work without perm issues.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 9 16:35:12 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com> Sun Oct 9 16:35:12 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>

View File

@ -18,7 +18,7 @@
%bcond_without tests %bcond_without tests
Name: cadabra2 Name: cadabra2
Version: 2.4.0.2 Version: 2.4.3.2
Release: 0 Release: 0
Summary: A computer algebra system for solving problems in field theory Summary: A computer algebra system for solving problems in field theory
License: GPL-3.0-or-later License: GPL-3.0-or-later
@ -178,10 +178,10 @@ ln %{buildroot}%{_datadir}/cadabra2/latex/* %{buildroot}%{_datadir}/texmf/tex/la
%check %check
export PATH=${PATH}:%{buildroot}%{_bindir} export PATH=${PATH}:%{buildroot}%{_bindir}
export PYTHONDONTWRITEBYTECODE=1 export PYTHONDONTWRITEBYTECODE=1
# Exclude tests that try to write config files to home dir; %%ctest does not accept additional options, go the manual way # Set HOME to current dir to allow tests that try to
pushd %__builddir # write config files to home dir to run without perm issues
ctest %{?_smp_mflags} -E "packages|manip|modules|meld" export HOME=`pwd`
popd %ctest
%endif %endif
%files %files