Accepting request 1111741 from home:badshah400:branches:science

- Update to version 2.4.4.1.
- Drop testing on 32-bit systems due to tolerance errors in a test (gh#kpeeters/cadabra2#280).

OBS-URL: https://build.opensuse.org/request/show/1111741
OBS-URL: https://build.opensuse.org/package/show/science/cadabra2?expand=0&rev=52
This commit is contained in:
Atri Bhattacharya 2023-09-17 10:50:32 +00:00 committed by Git OBS Bridge
parent 447106e1f0
commit 438519c862
5 changed files with 30 additions and 18 deletions

View File

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

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

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

View File

@ -1,8 +1,8 @@
Index: cadabra2-2.4.3.2/core/CMakeLists.txt Index: cadabra2-2.4.4.1/core/CMakeLists.txt
=================================================================== ===================================================================
--- cadabra2-2.4.3.2.orig/core/CMakeLists.txt --- cadabra2-2.4.4.1.orig/core/CMakeLists.txt
+++ cadabra2-2.4.3.2/core/CMakeLists.txt +++ cadabra2-2.4.4.1/core/CMakeLists.txt
@@ -284,7 +284,7 @@ target_link_libraries(cadabra2 PRIVATE @@ -292,7 +292,7 @@ target_link_libraries(cadabra2 PRIVATE
${GMPXX_LIBRARIES} ${GMPXX_LIBRARIES}
${GMP_LIBRARIES} ${GMP_LIBRARIES}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
@ -11,10 +11,10 @@ Index: cadabra2-2.4.3.2/core/CMakeLists.txt
# ${GLIBMM3_LIBRARIES} # ${GLIBMM3_LIBRARIES}
) )
Index: cadabra2-2.4.3.2/core/packages/CMakeLists.txt Index: cadabra2-2.4.4.1/core/packages/CMakeLists.txt
=================================================================== ===================================================================
--- cadabra2-2.4.3.2.orig/core/packages/CMakeLists.txt --- cadabra2-2.4.4.1.orig/core/packages/CMakeLists.txt
+++ cadabra2-2.4.3.2/core/packages/CMakeLists.txt +++ cadabra2-2.4.4.1/core/packages/CMakeLists.txt
@@ -66,8 +66,7 @@ foreach(PACKAGE ${COMPILED_PACKAGES}) @@ -66,8 +66,7 @@ foreach(PACKAGE ${COMPILED_PACKAGES})
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}")

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sun Sep 10 21:57:56 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
- Update to version 2.4.4.1:
* Update to fix issues with pybind11 and to avoid cmake
warnings.
- Drop testing on 32-bit systems due to tolerance errors in a
test (gh#kpeeters/cadabra2#280).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 7 08:00:00 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com> Wed Dec 7 08:00:00 UTC 2022 - Atri Bhattacharya <badshah400@gmail.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package cadabra2 # spec file for package cadabra2
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
%bcond_without tests %bcond_without tests
Name: cadabra2 Name: cadabra2
Version: 2.4.3.2 Version: 2.4.4.1
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
@ -174,6 +174,8 @@ sed -E -i "s|^#!/usr/bin/env python3|#!/usr/bin/python3|" %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/cadabra2/ mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/cadabra2/
ln %{buildroot}%{_datadir}/cadabra2/latex/* %{buildroot}%{_datadir}/texmf/tex/latex/cadabra2/ ln %{buildroot}%{_datadir}/cadabra2/latex/* %{buildroot}%{_datadir}/texmf/tex/latex/cadabra2/
# Disable testing for 32-bit due to tolerance issues https://github.com/kpeeters/cadabra2/issues/280
%ifnarch %ix86
%if %{with tests} %if %{with tests}
%check %check
export PATH=${PATH}:%{buildroot}%{_bindir} export PATH=${PATH}:%{buildroot}%{_bindir}
@ -183,6 +185,7 @@ export PYTHONDONTWRITEBYTECODE=1
export HOME=`pwd` export HOME=`pwd`
%ctest %ctest
%endif %endif
%endif
%files %files
%doc README.rst %doc README.rst
@ -198,10 +201,10 @@ export HOME=`pwd`
%{_bindir}/%{name}html %{_bindir}/%{name}html
%{_datadir}/%{name}/ %{_datadir}/%{name}/
%{_datadir}/texmf %{_datadir}/texmf
%{python3_sitelib}/cadabra2*.so %{python3_sitearch}/cadabra2*.so
%{python3_sitelib}/cadabra2_defaults.py %{python3_sitearch}/cadabra2_defaults.py
%{python3_sitelib}/cdb_appdirs.py %{python3_sitearch}/cdb_appdirs.py
%{python3_sitelib}/cdb/ %{python3_sitearch}/cdb/
%{_mandir}/man1/cadabra*.1%{?ext_man} %{_mandir}/man1/cadabra*.1%{?ext_man}
%files gui %files gui
@ -214,8 +217,8 @@ export HOME=`pwd`
%files -n jupyter-cadabra2-kernel %files -n jupyter-cadabra2-kernel
%license doc/license.txt %license doc/license.txt
%{python3_sitelib}/cadabra2_jupyter/ %{python3_sitearch}/cadabra2_jupyter/
%{python3_sitelib}/notebook/ %{python3_sitearch}/notebook/
%{_jupyter_kernel_dir}/cadabra2/ %{_jupyter_kernel_dir}/cadabra2/
%files examples %files examples