Hello community, here is the log from the commit of package cadabra2 for openSUSE:Factory checked in at 2020-01-04 19:22:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cadabra2 (Old) and /work/SRC/openSUSE:Factory/.cadabra2.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cadabra2" Sat Jan 4 19:22:15 2020 rev:13 rq:760812 version:2.2.8 Changes: -------- --- /work/SRC/openSUSE:Factory/cadabra2/cadabra2.changes 2019-06-25 22:22:23.485148044 +0200 +++ /work/SRC/openSUSE:Factory/.cadabra2.new.6675/cadabra2.changes 2020-01-04 19:22:17.233162386 +0100 @@ -1,0 +2,24 @@ +Sat Jan 4 01:21:06 UTC 2020 - Stefan Brüns <[email protected]> + +- Update to version 2.2.8: + * More versatile handling of Trace, including sorting using + cyclic symmetry (Connor). + * Fixes for combine (Connor). + * Save command-line history (Connor). + * Make imported notebooks use the default post_process function. + * Make unwrap move scalars out of exterior (wedge) products, see + this Q&A post. + * Fix bug with indices with accents (github/166). + * Added a cadabra2latex command to convert notebooks to LaTeX. + * Fixed issue building with latest Homebrew on macOS. + * Fixed Windows build issues and add python path settings at + runtime. + * Fixed bug with multipliers not reducing to canonical form. +- Add Fix-linking-of-cadabra-module.patch +- Remove timestamps from Doxygen generated HTML files, drop + obsolete cadabra2-rpmlintrc +- Use system jsoncpp +- Drop conditionals for obsolete distro versions +- Remove lots of unused/obsolete TeX BuildRequires. + +------------------------------------------------------------------- @@ -5 +29,27 @@ - * List of changes unavailable from upstream. + * Added cdb.utils.develop and cdb.relativity.abstract. + * Added authentication token to all client-server communication. + * Various extensions to the Trace property. + * Make property info available from Python (Dominic). + * Fixed integration by parts with index-less derivatives. + * Added eliminate_vielbein. + * Fixed display of lists of sympy expressions. + * Fixed (finally) UTF8 input for non-English symbols. + +- Update to 2.2.6 + * Experimental notebook diff viewer (Dominic). + * Warn when about to overwrite an existing notebook. + * Improvements for HiDPI screens especially on macOS. + * Fix crash in sym/asym. + * Fix undo/redo crash in notebook when deleting cells. + * Improvements to the cdb.core.manip package (Dominic). + * Fix in young_project_tensor. + * Fix pattern matching for anti-commuting factors. + * Added explicit_indices to convert expressions with + implicit indices to their explicit form. + * Add option to build a Jupyter kernel. + * Fix bug in split_index (acted on wrong parts of expressions). + * Fix bug with substitute not checking constraints for + single-factor patterns. + * Add partial option to substitute to require that products or sums + match all terms, not just a partial sum or partial product. + Old: ---- 2.2.7.tar.gz cadabra2-rpmlintrc New: ---- 2.2.8.tar.gz Fix-linking-of-cadabra-module.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cadabra2.spec ++++++ --- /var/tmp/diff_new_pack.PcNMIv/_old 2020-01-04 19:22:18.181162806 +0100 +++ /var/tmp/diff_new_pack.PcNMIv/_new 2020-01-04 19:22:18.185162808 +0100 @@ -1,7 +1,7 @@ # # spec file for package cadabra2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,65 +17,24 @@ Name: cadabra2 -Version: 2.2.7 +Version: 2.2.8 Release: 0 Summary: A computer algebra system for solving problems in field theory License: GPL-3.0-or-later Group: Productivity/Scientific/Math -Url: http://cadabra.science/ +URL: https://cadabra.science/ Source0: https://github.com/kpeeters/cadabra2/archive/%{version}.tar.gz -Source1: %{name}-rpmlintrc -Source2: %{name}-gtk.appdata.xml +Source1: %{name}-gtk.appdata.xml # PATCH-FIX-OPENSUSE add -pthread to CMAKE_CXX_FLAGS (as adivised in https://github.com/potree/PotreeConverter/issues/136) [email protected] Patch1: cadabra2-add-pthread-to-cxxflags.patch +# PATCH-FIX-UPSTREAM -- https://github.com/kpeeters/cadabra2/commit/71a406f32a654d2037b1d011f44af3fce4d9b50d.patch +Patch2: Fix-linking-of-cadabra-module.patch BuildRequires: appstream-glib BuildRequires: cmake BuildRequires: doxygen BuildRequires: gcc-c++ >= 4.9 BuildRequires: gmp-devel BuildRequires: hicolor-icon-theme -BuildRequires: libuuid-devel -BuildRequires: pcre-devel -BuildRequires: pkgconfig -BuildRequires: texlive-dvipng -BuildRequires: texlive-dvipng-bin -BuildRequires: texlive-epstopdf -BuildRequires: texlive-latex-bin -BuildRequires: texlive-makeindex-bin -BuildRequires: texlive-metafont-bin -BuildRequires: update-desktop-files -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(gtkmm-3.0) -BuildRequires: pkgconfig(sqlite3) -BuildRequires: tex(8r.enc) -BuildRequires: tex(adjustbox.sty) -BuildRequires: tex(caption.sty) -BuildRequires: tex(colortbl.sty) -BuildRequires: tex(fancyhdr.sty) -BuildRequires: tex(float.sty) -BuildRequires: tex(geometry.sty) -BuildRequires: tex(helvet.sty) -BuildRequires: tex(hyperref.sty) -BuildRequires: tex(multirow.sty) -BuildRequires: tex(natbib.sty) -BuildRequires: tex(pcrr8t.tfm) -BuildRequires: tex(phvr8t.tfm) -BuildRequires: tex(psyr.tfm) -BuildRequires: tex(rsfs10.tfm) -BuildRequires: tex(sectsty.sty) -BuildRequires: tex(tabu.sty) -BuildRequires: tex(textcomp.sty) -BuildRequires: tex(tocloft.sty) -BuildRequires: tex(wasy7.tfm) -BuildRequires: tex(wasysym.sty) -BuildRequires: tex(xtab.sty) -BuildRequires: tex(zptmcm7t.tfm) -Requires(post): texlive-kpathsea-bin -Requires(postun): texlive-kpathsea-bin -Recommends: %{name}-doc -Recommends: %{name}-examples -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1320 BuildRequires: libboost_date_time-devel BuildRequires: libboost_filesystem-devel BuildRequires: libboost_headers-devel @@ -83,15 +42,19 @@ BuildRequires: libboost_python3-devel BuildRequires: libboost_regex-devel BuildRequires: libboost_system-devel +BuildRequires: libuuid-devel +BuildRequires: pcre-devel +BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: python3-matplotlib BuildRequires: python3-sympy -%else -BuildRequires: boost-devel -BuildRequires: python-devel -BuildRequires: python-matplotlib -BuildRequires: python-sympy -%endif +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtkmm-3.0) +BuildRequires: pkgconfig(jsoncpp) +BuildRequires: pkgconfig(sqlite3) +Recommends: %{name}-doc +Recommends: %{name}-examples %description Cadabra2 is a computer algebra system (CAS) designed specifically for @@ -155,35 +118,32 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 rm examples/.gitignore +# Remove timestamps from Doxygen HTML files +echo "HTML_TIMESTAMP = NO" >> config/Doxyfile %build - -# FIXME: you should use %%cmake macro but it doesn't work -mkdir build && pushd build -cmake \\\ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \\\ - -DCMAKE_MANDIR=%{_mandir} \\\ - -DPACKAGING_MODE=ON \\\ -%if 0%{?suse_version} <= 1320 - -DUSE_PYTHON_3=OFF \\\ -%endif - -DINSTALL_LATEX_DIR=%{_datadir}/texmf \\\ - -DENABLE_FRONTEND=ON \\\ - -DENABLE_MATHEMATICA=OFF \\\ +%cmake \ + -DCMAKE_MANDIR=%{_mandir} \ + -DPACKAGING_MODE=ON \ + -DINSTALL_LATEX_DIR=%{_datadir}/texmf \ + -DENABLE_FRONTEND=ON \ + -DENABLE_SYSTEM_JSONPP=ON \ + -DENABLE_MATHEMATICA=OFF \ .. -make %{?_smp_mflags} -popd +%cmake_build +cd .. make %{?_smp_mflags} doc %install -%cmake_install DESTDIR=%{buildroot} +%cmake_install %suse_update_desktop_file cadabra2-gtk # INSTALL APPDATA TO /usr/share/metainfo -install -D -m0644 %{S:2} %{buildroot}%{_datadir}/metainfo/%{name}-gtk.appdata.xml +install -D -m0644 %{S:1} %{buildroot}%{_datadir}/metainfo/%{name}-gtk.appdata.xml # Replace "/usr/bin/env python3" hashbang by "/usr/bin/python3" sed -E -i "s|^#!/usr/bin/env python3|#!/usr/bin/python3|" %{buildroot}%{_bindir}/cadabra2 @@ -191,34 +151,21 @@ mkdir -p %{buildroot}%{_datadir}/texmf/tex/latex/cadabra2/ ln %{buildroot}%{_datadir}/cadabra2/latex/* %{buildroot}%{_datadir}/texmf/tex/latex/cadabra2/ -# Move man files to proper %%_mandir -mkdir -p %{buildroot}%{_mandir}/man1 -mv %{buildroot}%{_prefix}/man/man1/* %{buildroot}%{_mandir}/man1/ - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%if 0%{?suse_version} <= 1320 -%post gui -%icon_theme_cache_post -%desktop_database_post - -%postun gui -%icon_theme_cache_postun -%desktop_database_postun -%endif - %files %doc README.rst %license doc/license.txt %{_bindir}/cadabra2cadabra +%{_bindir}/cadabra2latex %{_bindir}/cadabra-server %{_bindir}/%{name} %{_bindir}/%{name}python %{_bindir}/%{name}html %{_datadir}/%{name}/ -%{_datadir}/texmf/tex/latex/cadabra2/ +%{_datadir}/texmf %{_mandir}/man1/cadabra*.1%{?ext_man} %files gui ++++++ 2.2.7.tar.gz -> 2.2.8.tar.gz ++++++ /work/SRC/openSUSE:Factory/cadabra2/2.2.7.tar.gz /work/SRC/openSUSE:Factory/.cadabra2.new.6675/2.2.8.tar.gz differ: char 13, line 1 ++++++ Fix-linking-of-cadabra-module.patch ++++++ >From 71a406f32a654d2037b1d011f44af3fce4d9b50d Mon Sep 17 00:00:00 2001 From: Kasper Peeters <[email protected]> Date: Fri, 13 Dec 2019 18:02:59 +0000 Subject: [PATCH] Fix linking of cadabra module. --- cmake/version.cmake | 2 +- core/CMakeLists.txt | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index d9356682ba..8141820ab8 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -216,6 +218,7 @@ set(LOCAL_SRC_FILES SympyCdb.cc YoungTab.cc modules/xperm_new.cc + ${CADABRA_LIBS_DIR}/whereami/whereami.c ${ALGORITHM_SRC_FILES} ${PROPERTY_SRC_FILES} ) @@ -278,6 +279,8 @@ target_link_libraries(cadabra2 PRIVATE ${GMPXX_LIBRARIES} ${GMP_LIBRARIES} ${Boost_LIBRARIES} + ${PYTHON_LIBRARIES} + ${GLIBMM3_LIBRARIES} ) if(ENABLE_SYSTEM_JSONCPP) target_link_libraries(cadabra2 PRIVATE
