Accepting request 1250649 from science

OBS-URL: https://build.opensuse.org/request/show/1250649
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cadabra2?expand=0&rev=29

MicroTeX.obscpio

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

MicroTeX.obsinfo

@@ -0,0 +1,4 @@
+name: MicroTeX
+version: 
+mtime: 1740073985
+commit: 9a019e3dcdc80dde1e399a18c3a708a6909f2c14

_service

@@ -1,14 +1,22 @@
 <?xml version="1.0"?>
 <services>
+  <service name="obs_scm" mode="manual">
+		<param name="url">https://github.com/kpeeters/MicroTeX.git</param>
+    <param name="scm">git</param>
+    <param name="revision">kpeeters/cadabra</param>
+		<param name="version">_none_</param>
+    <param name="filename">MicroTeX</param>
+    <param name="submodules">disable</param>
+  </service>
+<!--  Keep main source last since this determines %version  -->
   <service name="obs_scm" mode="manual">
 		<param name="url">https://github.com/kpeeters/cadabra2.git</param>
     <param name="scm">git</param>
-		<param name="revision">2.5.8</param>
+		<param name="revision">2.5.10</param>
 		<param name="versionformat">@PARENT_TAG@</param>
     <param name="filename">cadabra2</param>
     <param name="submodules">enable</param>
-  </service>
+  </service>  <service name="tar" mode="buildtime"/>
-  <service name="tar" mode="buildtime"/>
   <service name="recompress" mode="buildtime">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>

cadabra2-2.5.10.obscpio

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

cadabra2-2.5.8.obscpio

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

cadabra2-default-python-path.patch

@@ -1,21 +0,0 @@
----
- core/pythoncdb/py_helpers.cc |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-Index: cadabra2-2.5.6/core/pythoncdb/py_helpers.cc
-===================================================================
---- cadabra2-2.5.6.orig/core/pythoncdb/py_helpers.cc
-+++ cadabra2-2.5.6/core/pythoncdb/py_helpers.cc
-@@ -45,8 +45,10 @@ namespace cadabra {
- 
- 		if(spath=="") {
- 			py::module_ sysconfig = py::module_::import("sysconfig");
--			py::object result = sysconfig.attr("get_path")("platlib");
--			spath = result.cast<std::string>();
-+			// On openSUSE, this gives paths relative to /usr/local/; use 'stdlib' instead
-+			// py::object result = sysconfig.attr("get_path")("platlib");
-+			py::object result = sysconfig.attr("get_path")("stdlib");
-+			spath = result.cast<std::string>() + "/site-packages";
- 			// Some older systems return the wrong path in platlib: they
- 			// use "dist-packages", but still return "site-packages". So we
- 			// test for the existence of platlib, and if it does not

cadabra2.changes

@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Mon Mar  3 09:03:37 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 2.5.10:
+  * Bugfix for eliminate_kronecker.
+  * Fix for building Cadabra as a C++ library.
+  * Various UI and typesetting bug fixes.
+  * Get rid of websocketpp in favour of boost::beast so we can
+    build with boost >= 1.87.0.
+  * Fix for the homebrew package, and option to install the
+    development branch using homebrew.
+  * Add caching to the processing of substitution rules (Daniel).
+  * Fixes for inline execution of Python functions in maths
+    expressions.
+  * Do not gobble normal output when an error occurs notebook
+    execution.
+  * Fix inconsistent behaviour and crashes with split-view mode.
+  * Fix display of LaTeXForm properties.
+  * Documentation updates.
+  * Close LaTeX input cells on running them (configurable).
+  * Cleanup and document kernel options.
+  * Various additions to the plotting package cdb.graphics.plot
+    including docs.
+  * Add preliminary support for Plotly as plotting backend.
+  * Word wrap LaTeX input cells to keep notebooks readable for any
+    window width.
+  * Internal changes for python path handling.
+- New BuildRequires: pkgconfig(openssl)
+- Add MicroTeX as separate tarball: this is missed by upstream git
+  as a submodule, so obs_scm _service's `enable_submodules` is
+  unable to include it either.
+- Drop cadabra2-default-python-path.patch: no longer needed after
+  changes to upstream logic for finding python.
+- Drop use of deprecated %suse_update_desktop_file.
+- Restrict building jupyter kernel to openSUSE >= 1650 to avoid
+  unresolvables on Leap 15/16.
+
 -------------------------------------------------------------------
 Fri Oct 25 09:46:14 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
 

cadabra2.obsinfo

@@ -1,4 +1,4 @@
 name: cadabra2
-version: 2.5.8
+version: 2.5.10
-mtime: 1729846732
+mtime: 1735032898
-commit: b9ce745d0bf165d2256fe36bc891c503de11f3d6
+commit: 1bae9ac3d736a99ff96caeee9802f4b0af3178f2

cadabra2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cadabra2
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,29 +25,31 @@
 %{?sle15_python_module_pythons}
 %if 0%{?suse_version} > 1650
 %global pythons python3
+%bcond_without jupyter
+%else
+%bcond_with jupyter
 %endif
 Name:           cadabra2
-Version:        2.5.8
+Version:        2.5.10
 Release:        0
 Summary:        A computer algebra system for solving problems in field theory
 License:        GPL-3.0-or-later
 Group:          Productivity/Scientific/Math
 URL:            https://cadabra.science/
 Source0:        %{name}-%{version}.tar.xz
+Source1:        MicroTeX.tar.xz
 # 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-FEATURE-OPENSUSE cadabra2-default-python-path.patch badshah400@gmail.com -- Fix default python path when starting up cadabra2
-Patch1:         cadabra2-default-python-path.patch
 BuildRequires:  %{python_module devel >= 3.9}
 BuildRequires:  %{python_module gobject-devel}
-BuildRequires:  %{python_module ipykernel}
 BuildRequires:  %{python_module matplotlib}
 BuildRequires:  %{python_module pybind11-devel}
 BuildRequires:  %{python_module sympy}
 BuildRequires:  appstream-glib
 BuildRequires:  cmake
+BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
-BuildRequires:  gcc-c++ >= 4.9
+BuildRequires:  gcc-c++
 BuildRequires:  gmp-devel
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libboost_date_time-devel
@@ -61,14 +63,15 @@ BuildRequires:  libuuid-devel
 BuildRequires:  pcre-devel
 BuildRequires:  pkgconfig
 BuildRequires:  python-rpm-macros
-BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(gtkmm-3.0)
 BuildRequires:  pkgconfig(jsoncpp)
+BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(sqlite3)
 Requires:       python3 >= 3.8
 Recommends:     %{name}-doc
-%if 0%{?suse_version} >= 1550
+%if %{with jupyter}
+BuildRequires:  %{python_module ipykernel}
 BuildRequires:  jupyter-jupyter_core-filesystem
 %endif
 # SECTION For test
@@ -152,7 +155,12 @@ the solution of problems encountered in field theory.
 This package provides a jupyter kernel for %{name}.
 
 %prep
-%autosetup -p1
+%autosetup -p1 -b1
+
+# Populate microtex submodule using SOURCE1
+mkdir -p submodules/microtex
+cp -pr ../MicroTeX/* submodules/microtex/
+
 rm examples/.gitignore
 # Remove timestamps from Doxygen HTML files
 echo "HTML_TIMESTAMP = NO" >> config/Doxyfile
@@ -169,6 +177,7 @@ sed -i "1{/#!\/usr\/bin\/env python/d}" libs/appdirs/cdb_appdirs.py
   -DENABLE_MATHEMATICA:BOOL=OFF \
   -DBUILD_TESTS:BOOL=%{?with_tests:ON}%{!?with_tests:OFF} \
   -DPython_EXECUTABLE=%{_bindir}/$python \
+  -DENABLE_PY_JUPYTER=%{?with_jupyter:ON}%{!?with_jupyter:OFF} \
   %{nil}
 }
 
@@ -220,11 +229,13 @@ export HOME=`pwd`
 %dir %{_datadir}/metainfo
 %{_datadir}/metainfo/*.appdata.xml
 
+%if %{with jupyter}
 %files -n jupyter-cadabra2-kernel
 %license doc/license.txt
 %{python3_sitearch}/cadabra2_jupyter/
 %{python3_sitearch}/notebook/
 %{_jupyter_kernel_dir}/cadabra2/
+%endif
 
 %files examples
 %doc examples/