Accepting request 760749 from home:StefanBruens:branches:science
- 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.
OBS-URL: https://build.opensuse.org/request/show/760749
OBS-URL: https://build.opensuse.org/package/show/science/cadabra2?expand=0&rev=31
This commit is contained in:
Git OBS Bridge
parent
614a8c1eea
commit
a5904a94ef
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:9baec68c52fca1e7bcda70448b8596f335ef004f4fc670a1def4721e6d8ac035
|
|
||||||
size 24049395
|
|
||||||
3
2.2.8.tar.gz
Normal file
3
2.2.8.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:72786423b2ff847e8e0035326a8f1b2cdcf76a68c77f95588276bbccfaa74d7e
|
||||||
|
size 24075709
|
||||||
31
Fix-linking-of-cadabra-module.patch
Normal file
31
Fix-linking-of-cadabra-module.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From 71a406f32a654d2037b1d011f44af3fce4d9b50d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kasper Peeters <kasper.peeters@phi-sci.com>
|
||||||
|
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
|
||||||
@ -1,2 +0,0 @@
|
|||||||
# More than a thousand warnings about doxygen generated html doc files
|
|
||||||
addFilter("cadabra2-doc.* file-contains-date-and-time")
|
|
||||||
@ -1,3 +1,27 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Jan 4 01:21:06 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||||
|
|
||||||
|
- 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.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jun 25 09:24:38 UTC 2019 - Atri Bhattacharya <badshah400@gmail.com>
|
Tue Jun 25 09:24:38 UTC 2019 - Atri Bhattacharya <badshah400@gmail.com>
|
||||||
|
|
||||||
|
|||||||
117
cadabra2.spec
117
cadabra2.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package cadabra2
|
# 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
|
# 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
|
||||||
@ -17,65 +17,24 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: cadabra2
|
Name: cadabra2
|
||||||
Version: 2.2.7
|
Version: 2.2.8
|
||||||
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
|
||||||
Group: Productivity/Scientific/Math
|
Group: Productivity/Scientific/Math
|
||||||
Url: http://cadabra.science/
|
URL: https://cadabra.science/
|
||||||
Source0: https://github.com/kpeeters/cadabra2/archive/%{version}.tar.gz
|
Source0: https://github.com/kpeeters/cadabra2/archive/%{version}.tar.gz
|
||||||
Source1: %{name}-rpmlintrc
|
Source1: %{name}-gtk.appdata.xml
|
||||||
Source2: %{name}-gtk.appdata.xml
|
|
||||||
# PATCH-FIX-OPENSUSE add -pthread to CMAKE_CXX_FLAGS (as adivised in https://github.com/potree/PotreeConverter/issues/136) kkaempf@suse.de
|
# PATCH-FIX-OPENSUSE add -pthread to CMAKE_CXX_FLAGS (as adivised in https://github.com/potree/PotreeConverter/issues/136) kkaempf@suse.de
|
||||||
Patch1: cadabra2-add-pthread-to-cxxflags.patch
|
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: appstream-glib
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: gcc-c++ >= 4.9
|
BuildRequires: gcc-c++ >= 4.9
|
||||||
BuildRequires: gmp-devel
|
BuildRequires: gmp-devel
|
||||||
BuildRequires: hicolor-icon-theme
|
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_date_time-devel
|
||||||
BuildRequires: libboost_filesystem-devel
|
BuildRequires: libboost_filesystem-devel
|
||||||
BuildRequires: libboost_headers-devel
|
BuildRequires: libboost_headers-devel
|
||||||
@ -83,15 +42,19 @@ BuildRequires: libboost_program_options-devel
|
|||||||
BuildRequires: libboost_python3-devel
|
BuildRequires: libboost_python3-devel
|
||||||
BuildRequires: libboost_regex-devel
|
BuildRequires: libboost_regex-devel
|
||||||
BuildRequires: libboost_system-devel
|
BuildRequires: libboost_system-devel
|
||||||
|
BuildRequires: libuuid-devel
|
||||||
|
BuildRequires: pcre-devel
|
||||||
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: python3-matplotlib
|
BuildRequires: python3-matplotlib
|
||||||
BuildRequires: python3-sympy
|
BuildRequires: python3-sympy
|
||||||
%else
|
BuildRequires: update-desktop-files
|
||||||
BuildRequires: boost-devel
|
BuildRequires: pkgconfig(gtk+-3.0)
|
||||||
BuildRequires: python-devel
|
BuildRequires: pkgconfig(gtkmm-3.0)
|
||||||
BuildRequires: python-matplotlib
|
BuildRequires: pkgconfig(jsoncpp)
|
||||||
BuildRequires: python-sympy
|
BuildRequires: pkgconfig(sqlite3)
|
||||||
%endif
|
Recommends: %{name}-doc
|
||||||
|
Recommends: %{name}-examples
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Cadabra2 is a computer algebra system (CAS) designed specifically for
|
Cadabra2 is a computer algebra system (CAS) designed specifically for
|
||||||
@ -155,35 +118,32 @@ This package provides html documentation for %{name}.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
rm examples/.gitignore
|
rm examples/.gitignore
|
||||||
|
# Remove timestamps from Doxygen HTML files
|
||||||
|
echo "HTML_TIMESTAMP = NO" >> config/Doxyfile
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%cmake \
|
||||||
# FIXME: you should use %%cmake macro but it doesn't work
|
-DCMAKE_MANDIR=%{_mandir} \
|
||||||
mkdir build && pushd build
|
-DPACKAGING_MODE=ON \
|
||||||
cmake \\\
|
-DINSTALL_LATEX_DIR=%{_datadir}/texmf \
|
||||||
-DCMAKE_INSTALL_PREFIX=%{_prefix} \\\
|
-DENABLE_FRONTEND=ON \
|
||||||
-DCMAKE_MANDIR=%{_mandir} \\\
|
-DENABLE_SYSTEM_JSONPP=ON \
|
||||||
-DPACKAGING_MODE=ON \\\
|
-DENABLE_MATHEMATICA=OFF \
|
||||||
%if 0%{?suse_version} <= 1320
|
|
||||||
-DUSE_PYTHON_3=OFF \\\
|
|
||||||
%endif
|
|
||||||
-DINSTALL_LATEX_DIR=%{_datadir}/texmf \\\
|
|
||||||
-DENABLE_FRONTEND=ON \\\
|
|
||||||
-DENABLE_MATHEMATICA=OFF \\\
|
|
||||||
..
|
..
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
%cmake_build
|
||||||
popd
|
cd ..
|
||||||
make %{?_smp_mflags} doc
|
make %{?_smp_mflags} doc
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%cmake_install DESTDIR=%{buildroot}
|
%cmake_install
|
||||||
|
|
||||||
%suse_update_desktop_file cadabra2-gtk
|
%suse_update_desktop_file cadabra2-gtk
|
||||||
|
|
||||||
# INSTALL APPDATA TO /usr/share/metainfo
|
# 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"
|
# Replace "/usr/bin/env python3" hashbang by "/usr/bin/python3"
|
||||||
sed -E -i "s|^#!/usr/bin/env python3|#!/usr/bin/python3|" %{buildroot}%{_bindir}/cadabra2
|
sed -E -i "s|^#!/usr/bin/env python3|#!/usr/bin/python3|" %{buildroot}%{_bindir}/cadabra2
|
||||||
@ -191,34 +151,21 @@ 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/
|
||||||
|
|
||||||
# Move man files to proper %%_mandir
|
|
||||||
mkdir -p %{buildroot}%{_mandir}/man1
|
|
||||||
mv %{buildroot}%{_prefix}/man/man1/* %{buildroot}%{_mandir}/man1/
|
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%post -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -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
|
%files
|
||||||
%doc README.rst
|
%doc README.rst
|
||||||
%license doc/license.txt
|
%license doc/license.txt
|
||||||
%{_bindir}/cadabra2cadabra
|
%{_bindir}/cadabra2cadabra
|
||||||
|
%{_bindir}/cadabra2latex
|
||||||
%{_bindir}/cadabra-server
|
%{_bindir}/cadabra-server
|
||||||
%{_bindir}/%{name}
|
%{_bindir}/%{name}
|
||||||
%{_bindir}/%{name}python
|
%{_bindir}/%{name}python
|
||||||
%{_bindir}/%{name}html
|
%{_bindir}/%{name}html
|
||||||
%{_datadir}/%{name}/
|
%{_datadir}/%{name}/
|
||||||
%{_datadir}/texmf/tex/latex/cadabra2/
|
%{_datadir}/texmf
|
||||||
%{_mandir}/man1/cadabra*.1%{?ext_man}
|
%{_mandir}/man1/cadabra*.1%{?ext_man}
|
||||||
|
|
||||||
%files gui
|
%files gui
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user