From 91c556de27a32b3bb64fd12f08823d0b956bb1c0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 13 Jul 2023 13:30:38 -0600 Subject: [PATCH 01/46] Remove hevea dependency on i386 Other changes: - Fix path to texinfo.tex - Convert License tag to SPDX --- giac.spec | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/giac.spec b/giac.spec index be0823d..fa1e3a5 100644 --- a/giac.spec +++ b/giac.spec @@ -11,11 +11,17 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 1%{?dist} -# LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc -# BSD: src/tinymt32* -# MIT: libmicropython.a -License: GPLv3+ and MIT +Release: 2%{?dist} +# GPL-3.0-or-later: the project as a whole +# GPL-3.0-only: src/TmpFGLM.*, src/TmpLESystemSolver.* +# GPL-2.0-or-later: pariinl.h +# GPL-1.0-or-later OR Artistic-1.0-Perl: src/pgiac +# LGPL-3.0-or-later: src/Fl_GDK_Printer.cxx, Flv_List.cc, Flv_Table.cc +# LGPL-2.0-or-later: intl/, src/Flv_Data_Source.H, src/Flv_List.H, +# src/Flv_Table.H, src/Flve_Check_Button.H, src/Flve_Combo.H, src/Flve_Input.H +# MIT: micropython-1.12/, src/cutils.*, src/js.c, src/libbf.*, src/libregexp*, +# src/libunicode.*, src/list.h, src/qjs*, src/quickjs* +License: GPL-3.0-or-later AND GPL-3.0-only AND GPL-2.0-or-later AND (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LGPL-3.0-or-later AND LGPL-2.0-or-later AND MIT URL: http://www-fourier.ujf-grenoble.fr/~parisse/giac.html ## Source package is downloaded from ## http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/ @@ -118,14 +124,16 @@ Development files for libgiac. %package doc Summary: Detailed html documentation for Giac/Xcas BuildArch: noarch +%ifnarch %{ix86} BuildRequires: hevea +%endif BuildRequires: tex(latex), texinfo, texinfo-tex, texlive-stmaryrd # Javascript provided Provides: bundled(CodeMirror) Provides: bundled(FileSaver.js) -License: GPLv3+ and GFDL +License: GPL-3.0-or-later AND GFDL-1.1-or-later %description doc The detailled html documentation and examples for giac and xcas. It is directly accessible from xcas in many ways (browser, context search, thematic indexes). @@ -190,7 +198,7 @@ chmod -x examples/lewisw/fermat* find doc -name *~ -delete # Unbundle texinfo file -sed -i 's|config/texinfo.tex|%{_datadir}/texmf/tex/texinfo/texinfo.tex|g' Makefile.in +sed -i 's|config/texinfo.tex|%{_texmf_main}/tex/texinfo/texinfo.tex|g' Makefile.in rm -f config/texinfo.tex # Remove hidden files @@ -457,6 +465,11 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* Thu Jul 13 2023 Jerry James - 1.9.0.57-2 +- Remove hevea dependency on i386 +- Fix path to texinfo.tex +- Convert License tag to SPDX + * Thu Jun 29 2023 Antonio Trande 1.9.0.57-1 - Update to 1.9.0 sub-57 From d72a12a19da3fbee6c5539ac4cce7973384acc82 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 13 Jul 2023 13:34:57 -0600 Subject: [PATCH 02/46] Remove cocoalib dependency on i386 --- giac.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index fa1e3a5..712c52a 100644 --- a/giac.spec +++ b/giac.spec @@ -56,7 +56,9 @@ BuildRequires: gettext-devel BuildRequires: gcc-c++ BuildRequires: make BuildRequires: cliquer-devel +%ifnarch %{ix86} BuildRequires: cocoalib-devel +%endif BuildRequires: glpk-devel BuildRequires: gmp-devel BuildRequires: gmp-ecm-devel @@ -466,7 +468,7 @@ make -C check check %changelog * Thu Jul 13 2023 Jerry James - 1.9.0.57-2 -- Remove hevea dependency on i386 +- Remove hevea and cocoalib dependencies on i386 - Fix path to texinfo.tex - Convert License tag to SPDX From 167b1e24bf196e6df4df3cfd034a481cfb71c2a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 22:55:37 +0000 Subject: [PATCH 03/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 712c52a..2fdd7a4 100644 --- a/giac.spec +++ b/giac.spec @@ -11,7 +11,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 2%{?dist} +Release: 3%{?dist} # GPL-3.0-or-later: the project as a whole # GPL-3.0-only: src/TmpFGLM.*, src/TmpLESystemSolver.* # GPL-2.0-or-later: pariinl.h @@ -467,6 +467,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.9.0.57-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jul 13 2023 Jerry James - 1.9.0.57-2 - Remove hevea and cocoalib dependencies on i386 - Fix path to texinfo.tex From cb8207129db99e0e23be1362823e43e23c2b7750 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 20 Sep 2023 22:04:26 +0200 Subject: [PATCH 04/46] Update to 1.9.0 sub-59 (rhbz#2239514) --- .gitignore | 1 + giac-makesrc.sh | 2 +- giac.spec | 9 ++++++--- sources | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2683467..07ade58 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /giac-1.9.0.35.tar.gz /giac-1.9.0.37.tar.gz /giac-1.9.0.57.tar.gz +/giac-1.9.0.59.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index b86fa63..2036516 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.9.0" -VERSIONREV="57" +VERSIONREV="59" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index 2fdd7a4..28bc800 100644 --- a/giac.spec +++ b/giac.spec @@ -6,12 +6,12 @@ %global _lto_cflags %{nil} -%global subversion .57 +%global subversion .59 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 3%{?dist} +Release: 1%{?dist} # GPL-3.0-or-later: the project as a whole # GPL-3.0-only: src/TmpFGLM.*, src/TmpLESystemSolver.* # GPL-2.0-or-later: pariinl.h @@ -170,7 +170,7 @@ The pgiac command is a perl script to mix Latex documents with Giac computations. %prep -%autosetup -p0 -n %{name}-%{majver} -N +%autosetup -n %{name}-%{majver} -N %patch -P 0 -p1 -b .backup %patch -P 1 -p1 -b .backup @@ -467,6 +467,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* Wed Sep 20 2023 Antonio Trande 1.9.0.59-1 +- Update to 1.9.0 sub-59 (rhbz#2239514) + * Wed Jul 19 2023 Fedora Release Engineering - 1.9.0.57-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index b04bbea..5f7e81c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.57.tar.gz) = b429a2e8bba9564359a552080f5155ba6dd5dc4f075bd7f9850c6637494b68cedce4794f2ce3734fd50848aad202688101ef32031aaec4fe0815ada6fd5cadd0 +SHA512 (giac-1.9.0.59.tar.gz) = 07856320b27df59088dd1b1d04476bbf32d7f1fd818669d9c283d7a2ae37050c02ed48bd33beec9bee2fda2fe1f1b86b1808dbce51ad99d83e71c5cb8c824abe From 59172c5c8779544731c89c41f6599f6a891dec44 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Tue, 26 Sep 2023 19:16:02 +0200 Subject: [PATCH 05/46] Update to 1.9.0 sub-61 (rhbz#2240449) --- .gitignore | 1 + giac-makesrc.sh | 2 +- giac.spec | 5 ++++- sources | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 07ade58..6d36d73 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /giac-1.9.0.37.tar.gz /giac-1.9.0.57.tar.gz /giac-1.9.0.59.tar.gz +/giac-1.9.0.61.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 2036516..215ec5a 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.9.0" -VERSIONREV="59" +VERSIONREV="61" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index 28bc800..0e86ddc 100644 --- a/giac.spec +++ b/giac.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} -%global subversion .59 +%global subversion .61 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry @@ -467,6 +467,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* Tue Sep 26 2023 Antonio Trande 1.9.0.61-1 +- Update to 1.9.0 sub-61 (rhbz#2240449) + * Wed Sep 20 2023 Antonio Trande 1.9.0.59-1 - Update to 1.9.0 sub-59 (rhbz#2239514) diff --git a/sources b/sources index 5f7e81c..6c13a7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.59.tar.gz) = 07856320b27df59088dd1b1d04476bbf32d7f1fd818669d9c283d7a2ae37050c02ed48bd33beec9bee2fda2fe1f1b86b1808dbce51ad99d83e71c5cb8c824abe +SHA512 (giac-1.9.0.61.tar.gz) = 7b8f5050c829b96f299ac6c3810509f05c7a15c26ac30007286dd43bf52ff056509cd6a8d6b590c2ba24296f1cfedb0583ece9803be9386ab124086749d9c118 From ea8bc87cd938f2a8a8ecb8f1d057bda1193237a1 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Tue, 3 Oct 2023 18:14:01 +0200 Subject: [PATCH 06/46] Update to 1.9.0 sub-63 (rhbz#2241636) --- .gitignore | 1 + giac-makesrc.sh | 2 +- giac.spec | 5 ++++- sources | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6d36d73..fa63450 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /giac-1.9.0.57.tar.gz /giac-1.9.0.59.tar.gz /giac-1.9.0.61.tar.gz +/giac-1.9.0.63.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 215ec5a..ed59c1a 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.9.0" -VERSIONREV="61" +VERSIONREV="63" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index 0e86ddc..016f868 100644 --- a/giac.spec +++ b/giac.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} -%global subversion .61 +%global subversion .63 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry @@ -467,6 +467,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* Tue Oct 03 2023 Antonio Trande 1.9.0.63-1 +- Update to 1.9.0 sub-63 (rhbz#2241636) + * Tue Sep 26 2023 Antonio Trande 1.9.0.61-1 - Update to 1.9.0 sub-61 (rhbz#2240449) diff --git a/sources b/sources index 6c13a7c..ab0e0a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.61.tar.gz) = 7b8f5050c829b96f299ac6c3810509f05c7a15c26ac30007286dd43bf52ff056509cd6a8d6b590c2ba24296f1cfedb0583ece9803be9386ab124086749d9c118 +SHA512 (giac-1.9.0.63.tar.gz) = 9bfd4cce06334bf4414d7bd1881b4182324015e5da87e1b378d3463dad501cd489a774667b3622ea72830eb8dd71ecd0260d6e7498cb84698724a8939e57a134 From 159b0227654094d008498763299f2f4506212b7c Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sat, 4 Nov 2023 19:33:17 +0100 Subject: [PATCH 07/46] Update to 1.9.0 sub-69 (rhbz#2245682) --- .gitignore | 1 + giac-makesrc.sh | 2 +- giac.spec | 5 ++++- sources | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fa63450..a697850 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /giac-1.9.0.59.tar.gz /giac-1.9.0.61.tar.gz /giac-1.9.0.63.tar.gz +/giac-1.9.0.69.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index ed59c1a..1fd255b 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.9.0" -VERSIONREV="63" +VERSIONREV="69" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index 016f868..f2e0a49 100644 --- a/giac.spec +++ b/giac.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} -%global subversion .63 +%global subversion .69 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry @@ -467,6 +467,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* Sat Nov 04 2023 Antonio Trande 1.9.0.69-1 +- Update to 1.9.0 sub-69 (rhbz#2245682) + * Tue Oct 03 2023 Antonio Trande 1.9.0.63-1 - Update to 1.9.0 sub-63 (rhbz#2241636) diff --git a/sources b/sources index ab0e0a6..0486a3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.63.tar.gz) = 9bfd4cce06334bf4414d7bd1881b4182324015e5da87e1b378d3463dad501cd489a774667b3622ea72830eb8dd71ecd0260d6e7498cb84698724a8939e57a134 +SHA512 (giac-1.9.0.69.tar.gz) = 2e0c22a358a3555ba461ea0541f266bcf6d782b7d3cc6fbe2e9b5e9dd243ec6eafb57cc808ba188961e7154da8acff1cf6e3ac047141e14071843ef2c3517093 From 4096afec3149389d0e7b40a65e202f53e29e573d Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 17 Dec 2023 18:33:26 +0100 Subject: [PATCH 08/46] Update to 1.9.0 sub-73 (rhbz#2253863) --- .gitignore | 1 + giac-makesrc.sh | 2 +- giac.spec | 5 ++++- sources | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a697850..4a826a8 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /giac-1.9.0.61.tar.gz /giac-1.9.0.63.tar.gz /giac-1.9.0.69.tar.gz +/giac-1.9.0.73.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 1fd255b..23b5a9d 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.9.0" -VERSIONREV="69" +VERSIONREV="73" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index f2e0a49..f197ac4 100644 --- a/giac.spec +++ b/giac.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} -%global subversion .69 +%global subversion .73 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry @@ -467,6 +467,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* Sun Dec 17 2023 Antonio Trande 1.9.0.73-1 +- Update to 1.9.0 sub-73 (rhbz#2253863) + * Sat Nov 04 2023 Antonio Trande 1.9.0.69-1 - Update to 1.9.0 sub-69 (rhbz#2245682) diff --git a/sources b/sources index 0486a3a..c656c06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.69.tar.gz) = 2e0c22a358a3555ba461ea0541f266bcf6d782b7d3cc6fbe2e9b5e9dd243ec6eafb57cc808ba188961e7154da8acff1cf6e3ac047141e14071843ef2c3517093 +SHA512 (giac-1.9.0.73.tar.gz) = 508952ef954d599c4040540202602610bf8b3f3515148b02ab1ab75fd505eafc216c2577eb748b5fd3370bcf6a29f335d827ec81f0d9f09f29284abf0270f1d3 From 7ba7756fd266986d542a6aeae8961198e80d6d10 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 22:17:15 +0000 Subject: [PATCH 09/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index f197ac4..9e02af9 100644 --- a/giac.spec +++ b/giac.spec @@ -11,7 +11,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 1%{?dist} +Release: 2%{?dist} # GPL-3.0-or-later: the project as a whole # GPL-3.0-only: src/TmpFGLM.*, src/TmpLESystemSolver.* # GPL-2.0-or-later: pariinl.h @@ -467,6 +467,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.9.0.73-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Dec 17 2023 Antonio Trande 1.9.0.73-1 - Update to 1.9.0 sub-73 (rhbz#2253863) From 2a997b8f6039a21c0f6895361ddbada8a628432c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 14:46:08 +0000 Subject: [PATCH 10/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 9e02af9..e1b6e53 100644 --- a/giac.spec +++ b/giac.spec @@ -11,7 +11,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 2%{?dist} +Release: 3%{?dist} # GPL-3.0-or-later: the project as a whole # GPL-3.0-only: src/TmpFGLM.*, src/TmpLESystemSolver.* # GPL-2.0-or-later: pariinl.h @@ -467,6 +467,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.9.0.73-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.9.0.73-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 96b0dac6f8eb5ddb45dad58e2170eafd789501a1 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Fri, 9 Feb 2024 12:55:30 +0100 Subject: [PATCH 11/46] Update to 1.9.0 sub-91 (rhbz#2259889) --- .gitignore | 1 + ...iac-1.9.0-fix_micropy_compiler_flags.patch | 44 ++++++------------- giac-makesrc.sh | 2 +- giac.spec | 16 ++++--- sources | 2 +- 5 files changed, 28 insertions(+), 37 deletions(-) rename giac-1.6.0-fix_micropy_compiler_flags.patch => giac-1.9.0-fix_micropy_compiler_flags.patch (57%) diff --git a/.gitignore b/.gitignore index 4a826a8..1f249dd 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /giac-1.9.0.63.tar.gz /giac-1.9.0.69.tar.gz /giac-1.9.0.73.tar.gz +/giac-1.9.0.91.tar.gz diff --git a/giac-1.6.0-fix_micropy_compiler_flags.patch b/giac-1.9.0-fix_micropy_compiler_flags.patch similarity index 57% rename from giac-1.6.0-fix_micropy_compiler_flags.patch rename to giac-1.9.0-fix_micropy_compiler_flags.patch index 49ddd33..7789d51 100644 --- a/giac-1.6.0-fix_micropy_compiler_flags.patch +++ b/giac-1.9.0-fix_micropy_compiler_flags.patch @@ -5,7 +5,7 @@ CWARN = -Wall -Werror CWARN += -Wpointer-arith -Wuninitialized -CFLAGS = $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) -+CFLAGS = $(INC) $(CWARN) ${CFLAGS_FEDORA} -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) ++CFLAGS = $(INC) $(CWARN) -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) ${CFLAGS_FEDORA} -std=gnu99 # Debugging/Optimization ifdef DEBUG @@ -24,14 +24,14 @@ COPT = -g else -COPT = -g #-fomit-frame-pointer -flto -+COPT = ${CFLAGS_FEDORA} ++COPT = -g endif # compiler settings -CWARN = -Wall #-Werror -Wno-error=cpp -Wno-error=format -CFLAGS = -fPIC -DMICROPY_LIB $(INC) $(CWARN) -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) +CWARN = -Wall -+CFLAGS = -fPIC -DMICROPY_LIB $(INC) $(CWARN) ${CFLAGS_FEDORA} -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) ++CFLAGS = -fPIC -DMICROPY_LIB $(INC) $(CWARN) ${CFLAGS_FEDORA} -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) @@ -40,56 +40,40 @@ # source files SRC_C = $(shell find . -name \*.c) ---- micropython-1.12/nspire/Makefile.nspire.orig 2020-04-30 09:52:40.000000000 +0200 -+++ micropython-1.12/nspire/Makefile.nspire 2020-10-21 14:02:09.081234972 +0200 +--- micropython-1.12/nspire/Makefile.orig 2020-04-30 09:52:40.000000000 +0200 ++++ micropython-1.12/nspire/Makefile 2020-10-21 14:02:09.081234972 +0200 @@ -31,14 +31,14 @@ ifdef DEBUG COPT = -O0 -g else -COPT = -Os -g #-fomit-frame-pointer -flto -+COPT = -g #-fomit-frame-pointer -flto ++COPT = -g endif # compiler settings - CWARN = -Wall -Werror -Wno-error=cpp -Wno-error=format --CFLAGS = -DMICROPY_LIB $(INC) $(CWARN) -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) -+CFLAGS = -DMICROPY_LIB $(INC) $(CWARN) ${CFLAGS_FEDORA} -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) + CWARN = -Wall -Werror -Wno-error=cpp -Wno-error=format -Wno-error=implicit-function-declaration +-CFLAGS = -DMICROPY_LIB -mthumb-interwork $(INC) $(CWARN) -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) ++CFLAGS = -DMICROPY_LIB -mthumb-interwork $(INC) $(CWARN) $(CFLAGS_FEDORA) -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) -LDFLAGS = $(LDFLAGS_MOD) -lm $(LDFLAGS_EXTRA) -Wl,--nspireio -+LDFLAGS = ${LDFLAGS_FEDORA} $(LDFLAGS_MOD) -lm $(LDFLAGS_EXTRA) -Wl,--nspireio ++LDFLAGS = $(LDFLAGS_FEDORA) $(LDFLAGS_MOD) -lm $(LDFLAGS_EXTRA) -Wl,--nspireio # source files SRC_C = $(shell find . -name \*.c) ---- micropython-1.12/numworks/Makefile.simu.orig 2020-04-30 09:52:40.000000000 +0200 -+++ micropython-1.12/numworks/Makefile.simu 2020-10-21 14:04:15.408648069 +0200 +--- micropython-1.12/numworks/Makefile.orig 2020-04-30 09:52:40.000000000 +0200 ++++ micropython-1.12/numworks/Makefile 2020-10-21 14:04:15.408648069 +0200 @@ -31,16 +31,16 @@ ifdef DEBUG COPT = -O0 -g else -COPT = -Ofast -g #-fomit-frame-pointer -flto -+COPT = -g #-fomit-frame-pointer -flto ++COPT = -g endif # compiler settings CWARN = -Wall -Werror -Wno-error=cpp -Wno-error=format -CFLAGS = -DNUMWORKS -DMICROPY_LIB $(INC) $(CWARN) -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) -+CFLAGS = -DNUMWORKS -DMICROPY_LIB $(INC) $(CWARN) ${CFLAGS_FEDORA} -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) - CFLAGS += -fdata-sections -ffunction-sections -fno-strict-aliasing -fno-exceptions # -fpermissive - - --LDFLAGS = $(LDFLAGS_MOD) -lm $(LDFLAGS_EXTRA) -+LDFLAGS = ${LDFLAGS_FEDORA} $(LDFLAGS_MOD) -lm $(LDFLAGS_EXTRA) - - # source files - SRC_C = $(shell find . -name \*.c) ---- micropython-1.12/numworks/Makefile.numworks.orig 2020-04-30 09:52:40.000000000 +0200 -+++ micropython-1.12/numworks/Makefile.numworks 2020-10-21 14:06:40.454965360 +0200 -@@ -36,11 +36,11 @@ - - # compiler settings - CWARN = -Wall -Werror -Wno-error=cpp -Wno-error=format --CFLAGS = -DNUMWORKS -DMICROPY_LIB $(INC) $(CWARN) -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) -+CFLAGS = -DNUMWORKS -DMICROPY_LIB $(INC) $(CWARN) ${CFLAGS_FEDORA} -ansi -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) ++CFLAGS = -DNUMWORKS -DMICROPY_LIB $(INC) $(CWARN) $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) $(CFLAGS_FEDORA) -std=gnu99 CFLAGS += -mthumb -march=armv7e-m -mfloat-abi=hard -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -fdata-sections -ffunction-sections -fno-strict-aliasing -fno-exceptions # -fpermissive diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 23b5a9d..451433c 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.9.0" -VERSIONREV="73" +VERSIONREV="91" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index e1b6e53..9ec338b 100644 --- a/giac.spec +++ b/giac.spec @@ -6,12 +6,12 @@ %global _lto_cflags %{nil} -%global subversion .73 +%global subversion .91 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 3%{?dist} +Release: 1%{?dist} # GPL-3.0-or-later: the project as a whole # GPL-3.0-only: src/TmpFGLM.*, src/TmpLESystemSolver.* # GPL-2.0-or-later: pariinl.h @@ -36,7 +36,7 @@ Patch0: %{name}-iszero.patch Patch1: %{name}-config.patch # Use Fedora compiler flags -Patch2: %{name}-1.6.0-fix_micropy_compiler_flags.patch +Patch2: %{name}-1.9.0-fix_micropy_compiler_flags.patch # Adapt to cocoalib 0.99700 Patch3: %{name}-cocoalib.patch @@ -225,7 +225,7 @@ autoreconf -ivf # https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2817 OPT_FLAGS=$(echo "%build_cxxflags" | %{__sed} -e 's/-Werror=format-security/-Wno-error=format-security/') export CXXFLAGS="$OPT_FLAGS -std=gnu++14" -export CFLAGS="$OPT_FLAGS" +export CFLAGS_FEDORA="$OPT_FLAGS" %configure --enable-static=yes --with-included-gettext=no --enable-nls=yes \ --enable-tommath=no --enable-debug=no --enable-gc=no --enable-sscl=no \ --enable-dl=yes --enable-gsl=yes --enable-lapack=yes --enable-pari=yes \ @@ -241,7 +241,7 @@ OPT_FLAGS=$(echo "%build_cflags" | %{__sed} -e 's/-Werror=format-security/-Wno-e export CXXFLAGS="$OPT_FLAGS -std=gnu++14" export CFLAGS_FEDORA="$OPT_FLAGS" export LDFLAGS_FEDORA="$OPT_FLAGS" -%make_build V=1 +%make_build # Rebuild giac_*.info and Convert info file to utf-8 (cd doc ; make) @@ -467,6 +467,12 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* Fri Feb 09 2024 Antonio Trande 1.9.0.91-1 +- Update to 1.9.0 sub-91 (rhbz#2259889) + +* Sat Jan 27 2024 Antonio Trande 1.9.0.85-1 +- Update to 1.9.0 sub-85 (rhbz#2259889) + * Wed Jan 24 2024 Fedora Release Engineering - 1.9.0.73-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index c656c06..ba9a2cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.73.tar.gz) = 508952ef954d599c4040540202602610bf8b3f3515148b02ab1ab75fd505eafc216c2577eb748b5fd3370bcf6a29f335d827ec81f0d9f09f29284abf0270f1d3 +SHA512 (giac-1.9.0.91.tar.gz) = c20c9483903dc99b63e438608a2fbb6c296b27e70459e583268a312dafcd2582949dae9b86c825240e831ab1a288fff34a985864067ba96a5dec7e3f9d86f932 From b6e9a6a683c0be9a6210bf1964e12f4a9d979baa Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sat, 10 Feb 2024 19:41:50 +0100 Subject: [PATCH 12/46] Undefine GLIBCXX_ASSERTIONS --- giac-undefine_GLIBCXX_ASSERTIONS.patch | 13 +++++++++++++ giac.spec | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 giac-undefine_GLIBCXX_ASSERTIONS.patch diff --git a/giac-undefine_GLIBCXX_ASSERTIONS.patch b/giac-undefine_GLIBCXX_ASSERTIONS.patch new file mode 100644 index 0000000..d9c4b63 --- /dev/null +++ b/giac-undefine_GLIBCXX_ASSERTIONS.patch @@ -0,0 +1,13 @@ +--- a/src/first.orig.h 2023-05-24 09:52:40.000000000 +0200 ++++ b/src/first.h 2024-02-10 19:37:26.376884368 +0100 +@@ -21,6 +21,10 @@ + #ifndef _GIAC_FIRST_H_ + #define _GIAC_FIRST_H_ + ++#ifdef _GLIBCXX_ASSERTIONS ++#undef _GLIBCXX_ASSERTIONS ++#endif ++ + #ifdef NUMWORKS + #define KHICAS 1 + #endif diff --git a/giac.spec b/giac.spec index 9ec338b..943c741 100644 --- a/giac.spec +++ b/giac.spec @@ -11,7 +11,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 1%{?dist} +Release: 2%{?dist} # GPL-3.0-or-later: the project as a whole # GPL-3.0-only: src/TmpFGLM.*, src/TmpLESystemSolver.* # GPL-2.0-or-later: pariinl.h @@ -49,6 +49,9 @@ Patch5: %{name}-pari2.15.patch Patch6: %{name}-delete-fenv.patch +# https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=3&t=2895 +Patch7: %{name}-undefine_GLIBCXX_ASSERTIONS.patch + BuildRequires: autoconf, libtool BuildRequires: python3-devel BuildRequires: readline-devel @@ -179,6 +182,7 @@ with Giac computations. %patch -P 4 -p1 -b .backup %patch -P 5 -p1 -b .backup %patch -P 6 -p1 -b .backup +%patch -P 7 -p1 -b .backup # Remove local intl (already bundled in fedora) rm -rf intl/*.h @@ -467,6 +471,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* Sat Feb 10 2024 Antonio Trande 1.9.0.91-2 +- Undefine GLIBCXX_ASSERTIONS + * Fri Feb 09 2024 Antonio Trande 1.9.0.91-1 - Update to 1.9.0 sub-91 (rhbz#2259889) From cd4fecf8ef73370d62554843a3c134f1d5d7f17a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 29 Mar 2024 15:27:53 -0600 Subject: [PATCH 13/46] Rebuild for cocoalib 0.99850 --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 943c741..d80030e 100644 --- a/giac.spec +++ b/giac.spec @@ -11,7 +11,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 2%{?dist} +Release: 3%{?dist} # GPL-3.0-or-later: the project as a whole # GPL-3.0-only: src/TmpFGLM.*, src/TmpLESystemSolver.* # GPL-2.0-or-later: pariinl.h @@ -471,6 +471,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* Fri Mar 29 2024 Jerry James - 1.9.0.91-3 +- Rebuild for cocoalib 0.99850 + * Sat Feb 10 2024 Antonio Trande 1.9.0.91-2 - Undefine GLIBCXX_ASSERTIONS From 2fdc93d9a98bef8feeeb4661f3d586ff8e675ad2 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 7 Apr 2024 21:14:33 +0200 Subject: [PATCH 14/46] Update to 1.9.0 sub-97 (rhbz#2264455) --- .gitignore | 1 + giac-delete-fenv.patch | 23 ----------------------- giac-makesrc.sh | 2 +- giac-undefine_GLIBCXX_ASSERTIONS.patch | 17 ++++++++++------- giac.spec | 12 ++++++------ sources | 2 +- 6 files changed, 19 insertions(+), 38 deletions(-) delete mode 100644 giac-delete-fenv.patch diff --git a/.gitignore b/.gitignore index 1f249dd..f52856d 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /giac-1.9.0.69.tar.gz /giac-1.9.0.73.tar.gz /giac-1.9.0.91.tar.gz +/giac-1.9.0.97.tar.gz diff --git a/giac-delete-fenv.patch b/giac-delete-fenv.patch deleted file mode 100644 index 91de4e3..0000000 --- a/giac-delete-fenv.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -urN giac-1.9.0.orig/src/fenv.h giac-1.9.0/src/fenv.h ---- giac-1.9.0.orig/src/fenv.h 2021-03-20 12:09:36.000000000 +0100 -+++ giac-1.9.0/src/fenv.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,7 +0,0 @@ --#ifndef FENV_H --#define FENV_H --#define FE_TONEAREST 0 --#define FE_DOWNWARD 1 --#define FE_UPWARD 2 --#define PTHREAD_MUTEX_INITIALIZER 0 --#endif -diff -urN giac-1.9.0.orig/src/Makefile.am giac-1.9.0/src/Makefile.am ---- giac-1.9.0.orig/src/Makefile.am 2022-04-11 09:52:40.000000000 +0200 -+++ giac-1.9.0/src/Makefile.am 2022-12-07 11:12:50.321144231 +0100 -@@ -30,7 +30,7 @@ - lexer_tab_int.h \ - static_help.h giacPCH.h giacintl.h gmp_replacements.h myostream.h \ - lpsolve.h optimization.h signalprocessing.h graphe.h graphtheory.h nautywrapper.h markup.h kdisplay.h k_csdk.h k_defs.h \ --fenv.h libregexp.h libregexp-opcode.h libunicode.h libunicode-table.h \ -+libregexp.h libregexp-opcode.h libunicode.h libunicode-table.h \ - libbf.h list.h cutils.h qjsgiac.h \ - quickjs.h js.h quickjs-atom.h quickjs-libc.h quickjs-opcode.h bf2gmp.h - diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 451433c..c4d3f2f 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.9.0" -VERSIONREV="91" +VERSIONREV="97" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac-undefine_GLIBCXX_ASSERTIONS.patch b/giac-undefine_GLIBCXX_ASSERTIONS.patch index d9c4b63..d0055a9 100644 --- a/giac-undefine_GLIBCXX_ASSERTIONS.patch +++ b/giac-undefine_GLIBCXX_ASSERTIONS.patch @@ -1,13 +1,16 @@ --- a/src/first.orig.h 2023-05-24 09:52:40.000000000 +0200 +++ b/src/first.h 2024-02-10 19:37:26.376884368 +0100 -@@ -21,6 +21,10 @@ - #ifndef _GIAC_FIRST_H_ +@@ -22,12 +22,7 @@ #define _GIAC_FIRST_H_ -+#ifdef _GLIBCXX_ASSERTIONS -+#undef _GLIBCXX_ASSERTIONS -+#endif -+ + // register is deprecated in c++17 +-#define register +- +- +-#ifdef _GLIBCXX_ASSERTIONS +-#undef _GLIBCXX_ASSERTIONS +-#endif ++#define register + #ifdef NUMWORKS #define KHICAS 1 - #endif diff --git a/giac.spec b/giac.spec index d80030e..e75a56a 100644 --- a/giac.spec +++ b/giac.spec @@ -6,12 +6,12 @@ %global _lto_cflags %{nil} -%global subversion .91 +%global subversion .97 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 3%{?dist} +Release: 1%{?dist} # GPL-3.0-or-later: the project as a whole # GPL-3.0-only: src/TmpFGLM.*, src/TmpLESystemSolver.* # GPL-2.0-or-later: pariinl.h @@ -47,10 +47,8 @@ Patch4: %{name}-fix_graphe_file.patch # Adapt to pari 2.15.0 Patch5: %{name}-pari2.15.patch -Patch6: %{name}-delete-fenv.patch - # https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=3&t=2895 -Patch7: %{name}-undefine_GLIBCXX_ASSERTIONS.patch +Patch6: %{name}-undefine_GLIBCXX_ASSERTIONS.patch BuildRequires: autoconf, libtool BuildRequires: python3-devel @@ -182,7 +180,6 @@ with Giac computations. %patch -P 4 -p1 -b .backup %patch -P 5 -p1 -b .backup %patch -P 6 -p1 -b .backup -%patch -P 7 -p1 -b .backup # Remove local intl (already bundled in fedora) rm -rf intl/*.h @@ -471,6 +468,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* Sun Apr 07 2024 Antonio Trande 1.9.0.97-1 +- Update to 1.9.0 sub-97 (rhbz#2264455) + * Fri Mar 29 2024 Jerry James - 1.9.0.91-3 - Rebuild for cocoalib 0.99850 diff --git a/sources b/sources index ba9a2cc..60337c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.91.tar.gz) = c20c9483903dc99b63e438608a2fbb6c296b27e70459e583268a312dafcd2582949dae9b86c825240e831ab1a288fff34a985864067ba96a5dec7e3f9d86f932 +SHA512 (giac-1.9.0.97.tar.gz) = 7c54a20c48b24d7170a84fce4fe1572d908cfb56a7935a4eb17a2d71f29603ba527cece801602ce1b933b1038d26c33d91bde1a4f540a7f71e55866634e421eb From 65d900a4de824d3adbcc3c424862537c9e731854 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Fri, 10 May 2024 15:10:11 +0200 Subject: [PATCH 15/46] Update to 1.9.0 sub-99 (rhbz#2279596) --- .gitignore | 1 + giac-makesrc.sh | 2 +- giac.spec | 5 ++++- sources | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f52856d..8032eaf 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /giac-1.9.0.73.tar.gz /giac-1.9.0.91.tar.gz /giac-1.9.0.97.tar.gz +/giac-1.9.0.99.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index c4d3f2f..93eefd7 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.9.0" -VERSIONREV="97" +VERSIONREV="99" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index e75a56a..ecfe3b8 100644 --- a/giac.spec +++ b/giac.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} -%global subversion .97 +%global subversion .99 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry @@ -468,6 +468,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* Fri May 10 2024 Antonio Trande 1.9.0.99-1 +- Update to 1.9.0 sub-99 (rhbz#2279596) + * Sun Apr 07 2024 Antonio Trande 1.9.0.97-1 - Update to 1.9.0 sub-97 (rhbz#2264455) diff --git a/sources b/sources index 60337c5..8ab7649 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.97.tar.gz) = 7c54a20c48b24d7170a84fce4fe1572d908cfb56a7935a4eb17a2d71f29603ba527cece801602ce1b933b1038d26c33d91bde1a4f540a7f71e55866634e421eb +SHA512 (giac-1.9.0.99.tar.gz) = f165ae7a9be0aa702a912a09990243b7ad456f326ca97bae089ba1e8b6b1f9641355aca0f7afe38d12e0fc97da3a92519cf335e53e59582447bf7af66640cd32 From 3cc100fde27f513727de7e32d578760ccac7e2cb Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 16 Jun 2024 20:54:23 +0200 Subject: [PATCH 16/46] Release 1.9.0.992 --- .gitignore | 1 + giac-makesrc.sh | 2 +- giac-undefine_GLIBCXX_ASSERTIONS.patch | 2 +- giac.spec | 417 +------------------------ sources | 2 +- 5 files changed, 7 insertions(+), 417 deletions(-) diff --git a/.gitignore b/.gitignore index 8032eaf..c5333a2 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /giac-1.9.0.91.tar.gz /giac-1.9.0.97.tar.gz /giac-1.9.0.99.tar.gz +/giac-1.9.0.992.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 93eefd7..1c3c1b2 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.9.0" -VERSIONREV="99" +VERSIONREV="992" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac-undefine_GLIBCXX_ASSERTIONS.patch b/giac-undefine_GLIBCXX_ASSERTIONS.patch index d0055a9..76ae2d4 100644 --- a/giac-undefine_GLIBCXX_ASSERTIONS.patch +++ b/giac-undefine_GLIBCXX_ASSERTIONS.patch @@ -12,5 +12,5 @@ -#endif +#define register - #ifdef NUMWORKS + #if defined NUMWORKS && !defined SDL_KHICAS #define KHICAS 1 diff --git a/giac.spec b/giac.spec index ecfe3b8..35b370c 100644 --- a/giac.spec +++ b/giac.spec @@ -6,12 +6,12 @@ %global _lto_cflags %{nil} -%global subversion .99 +%global subversion .992 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 1%{?dist} +Release: %autorelease # GPL-3.0-or-later: the project as a whole # GPL-3.0-only: src/TmpFGLM.*, src/TmpLESystemSolver.* # GPL-2.0-or-later: pariinl.h @@ -468,415 +468,4 @@ make -C check check %{_datadir}/giac/examples/ %changelog -* Fri May 10 2024 Antonio Trande 1.9.0.99-1 -- Update to 1.9.0 sub-99 (rhbz#2279596) - -* Sun Apr 07 2024 Antonio Trande 1.9.0.97-1 -- Update to 1.9.0 sub-97 (rhbz#2264455) - -* Fri Mar 29 2024 Jerry James - 1.9.0.91-3 -- Rebuild for cocoalib 0.99850 - -* Sat Feb 10 2024 Antonio Trande 1.9.0.91-2 -- Undefine GLIBCXX_ASSERTIONS - -* Fri Feb 09 2024 Antonio Trande 1.9.0.91-1 -- Update to 1.9.0 sub-91 (rhbz#2259889) - -* Sat Jan 27 2024 Antonio Trande 1.9.0.85-1 -- Update to 1.9.0 sub-85 (rhbz#2259889) - -* Wed Jan 24 2024 Fedora Release Engineering - 1.9.0.73-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.9.0.73-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Dec 17 2023 Antonio Trande 1.9.0.73-1 -- Update to 1.9.0 sub-73 (rhbz#2253863) - -* Sat Nov 04 2023 Antonio Trande 1.9.0.69-1 -- Update to 1.9.0 sub-69 (rhbz#2245682) - -* Tue Oct 03 2023 Antonio Trande 1.9.0.63-1 -- Update to 1.9.0 sub-63 (rhbz#2241636) - -* Tue Sep 26 2023 Antonio Trande 1.9.0.61-1 -- Update to 1.9.0 sub-61 (rhbz#2240449) - -* Wed Sep 20 2023 Antonio Trande 1.9.0.59-1 -- Update to 1.9.0 sub-59 (rhbz#2239514) - -* Wed Jul 19 2023 Fedora Release Engineering - 1.9.0.57-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jul 13 2023 Jerry James - 1.9.0.57-2 -- Remove hevea and cocoalib dependencies on i386 -- Fix path to texinfo.tex -- Convert License tag to SPDX - -* Thu Jun 29 2023 Antonio Trande 1.9.0.57-1 -- Update to 1.9.0 sub-57 - -* Wed Feb 01 2023 Antonio Trande 1.9.0.37-1 -- Update to 1.9.0 sub-37 - -* Thu Jan 19 2023 Fedora Release Engineering - 1.9.0.35-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Jan 10 2023 Antonio Trande 1.9.0.35-1 -- Update to 1.9.0 sub-35 - -* Sun Jan 08 2023 Antonio Trande 1.9.0.29-3 -- Disable LTO flags - -* Wed Dec 7 2022 Florian Weimer - 1.9.0.29-2 -- C99 compatibility fixes (#2151473) -- Do not override the system file. - -* Fri Nov 18 2022 Antonio Trande 1.9.0.29-1 -- Update to 1.9.0 sub-29 - -* Tue Sep 27 2022 Jerry James - 1.9.0.19-3 -- Rebuild for pari 2.15.0 - -* Tue Aug 23 2022 Mamoru TASAKA - 1.9.0.19-2 -- Rebuild for gsl-2.7.1 - -* Fri Aug 12 2022 Antonio Trande 1.9.0.19-1 -- Update to 1.9.0 sub-19 - -* Thu Jul 21 2022 Fedora Release Engineering - 1.7.0.29-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Mar 24 2022 Jerry James - 1.7.0.29-3 -- Rebuild for cocoalib 0.99800 - -* Thu Jan 20 2022 Fedora Release Engineering - 1.7.0.29-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Sep 04 2021 Antonio Trande 1.7.0.29-1 -- Update to 1.7.0 sub-29 - -* Thu Jul 22 2021 Fedora Release Engineering - 1.7.0.13-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jun 29 2021 Jerry James - 1.7.0.13-3 -- Rebuild for ntl 11.5.1 - -* Thu Jun 17 2021 Jerry James - 1.7.0.13-2 -- Rebuild for cocoalib 0.99713 -- Build with cliquer support - -* Sat Jun 12 2021 Antonio Trande 1.7.0.13-1 -- Update to 1.7.0 sub-13 - -* Thu Mar 25 2021 Antonio Trande 1.7.0.1-1 -- Update to 1.7.0 sub-1 -- Remove wasm file with bad magic number -- Obsolete old appdata file - -* Thu Mar 25 2021 Antonio Trande 1.6.0.25-5 -- Fix Version tag in desktop file -- Fix rhbz#1943048 - -* Wed Feb 17 2021 Jerry James - 1.6.0.25-4 -- Rebuild for cocoalib 0.99712 -- Work harder to avoid depending on libgslcblas - -* Tue Jan 26 2021 Fedora Release Engineering - 1.6.0.25-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Nov 9 2020 Jerry James - 1.6.0.25-2 -- Rebuild for pari 2.13.0 -- Bring back (modified) cocoalib patch, still needed for cocoalib support - -* Wed Oct 21 2020 Antonio Trande 1.6.0.25-1 -- Update to 1.6.0 sub-25 -- Patch configure.ac instead of configure.in - -* Thu Aug 27 2020 Iñaki Úcar - 1.6.0.7-5 -- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager - -* Tue Aug 18 2020 Jeff Law - 1.6.0.7-4 -- Force C++14 as this code is not C++17 ready - -* Sat Aug 01 2020 Fedora Release Engineering - 1.6.0.7-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.6.0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sun Jul 19 2020 Antonio Trande 1.6.0.7-1 -- Update to 1.6.0 sub-7 - -* Tue Jun 30 2020 Jeff Law - 1.5.0.85-4 -- Fix broken configure test compromised by LTO - -* Tue Jun 2 2020 Jerry James - 1.5.0.85-3 -- Rebuild for nauty 2.7.1 - -* Fri Mar 20 2020 Jerry James - 1.5.0.85-2 -- Rebuild for CoCoAlib 0.99700 -- Add cocoalib patch -- Build with gmp-ecm, libcurl, libsamplerate, and nauty support - -* Tue Feb 04 2020 Antonio Trande 1.5.0.85-1 -- Update to 1.5.0 sub-85 - -* Tue Jan 28 2020 Fedora Release Engineering - 1.5.0.75-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jan 9 2020 Jerry James - 1.5.0.75-3 -- Rebuild for ntl 11.4.3 - -* Sat Dec 7 2019 Jerry James - 1.5.0.75-2 -- Rebuild for CoCoAlib 0.99650 again - -* Thu Nov 28 2019 Antonio Trande 1.5.0.75-1 -- Update to 1.5.0 sub-75 -- Drop cocoalib patch - -* Wed Nov 27 2019 Jerry James - 1.5.0.63-4 -- Rebuild for CoCoAlib 0.99650 - -* Fri Oct 11 2019 Jerry James - 1.5.0.63-3 -- Rebuild for mpfr 4 - -* Tue Sep 24 2019 Jerry James - 1.5.0.63-2 -- Rebuild for ntl 11.3.4 - -* Sat Sep 14 2019 Antonio Trande 1.5.0.63-1 -- Update to 1.5.0 sub-63 - -* Tue Aug 20 2019 Susi Lehtola - 1.5.0.53-3 -- Rebuilt for GSL 2.6. - -* Thu Jul 25 2019 Fedora Release Engineering - 1.5.0.53-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat May 18 2019 Antonio Trande 1.5.0.53-1 -- Update to 1.5.0 sub-53 - -* Wed Apr 24 2019 Björn Esser - 1.5.0.35-4 -- Remove hardcoded gzip suffix from GNU info pages - -* Sun Feb 17 2019 Igor Gnatenko - 1.5.0.35-3 -- Rebuild for readline 8.0 - -* Thu Jan 31 2019 Fedora Release Engineering - 1.5.0.35-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 14 2019 Antonio Trande 1.5.0.35-1 -- Update to 1.5.0 sub-35 - -* Sat Oct 13 2018 Jerry James - 1.5.0.3-2 -- Rebuild for ntl 11.3.0 - -* Wed Oct 10 2018 Antonio Trande 1.5.0.3-1 -- Update to 1.5.0 sub-3 - -* Fri Aug 10 2018 Jerry James - 1.4.9.59-5 -- Rebuild for CoCoAlib 0.99600, ntl 11.2.1, and pari 2.11.0 - -* Fri Jul 13 2018 Fedora Release Engineering - 1.4.9.59-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jul 3 2018 Jerry James - 1.4.9.59-3 -- Build with CoCoAlib, glpk, and libao support -- Remove scriptlets that call install-info - -* Sat Jun 2 2018 Jerry James - 1.4.9.59-2 -- Rebuild for libfplll 5.2.1 and mpfi 1.5.3 - -* Fri May 18 2018 Antonio Trande 1.4.9.59-1 -- Update to 1.4.9 sub-59 -- Tests still disabled (some of them fail again) - -* Wed Mar 28 2018 Peter Robinson 1.4.9.45-5 -- Build on all arches (tests now pass) - -* Fri Feb 16 2018 Antonio Trande - 1.4.9.45-4 -- Use %%ldconfig_scriptlets - -* Wed Feb 07 2018 Fedora Release Engineering - 1.4.9.45-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Feb 03 2018 Antonio Trande 1.4.9.45-2 -- Re-set previous ldconfig scripts - -* Sat Feb 03 2018 Antonio Trande 1.4.9.45-1 -- Update to 1.4.9 sub-45 -- Use %%ldconfig_scriptlets - -* Thu Jan 11 2018 Igor Gnatenko - 1.4.9.43-2 -- Remove obsolete scriptlets - -* Sun Dec 24 2017 Antonio Trande 1.4.9.43-1 -- Update to 1.4.9 sub-43 - -* Thu Dec 21 2017 Antonio Trande 1.4.9.41-3 -- Symlink restored - -* Thu Dec 21 2017 Antonio Trande 1.4.9.41-2 -- Undo latest symlink changes - -* Sun Dec 17 2017 Antonio Trande 1.4.9.41-1 -- Update to 1.4.9 sub-41 -- Appdata file moved into metainfo shared data directory - -* Sat Dec 02 2017 Antonio Trande 1.4.9.33-1 -- Update to 1.4.9 sub-33 -- Fix symlinks - -* Fri Dec 01 2017 Antonio Trande 1.4.9.29-2 -- Make symlinks used by QCAS - -* Thu Nov 30 2017 Antonio Trande 1.4.9.29-1 -- Update to 1.4.9 sub-29 - -* Thu Sep 28 2017 Jerry James - 1.2.3.57-1 -- Rebuild for ntl 10.5.0 -- Fix versioning scheme - -* Wed Aug 02 2017 Fedora Release Engineering - 1.2.3-9.57 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Antonio Trande 1.2.3-8.57 -- Update to 1.2.3 sub-57 - -* Wed Jul 26 2017 Fedora Release Engineering - 1.2.3-7.49 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jul 13 2017 Petr Pisar - 1.2.3-6.49 -- perl dependency renamed to perl-interpreter - -* Sun Jun 11 2017 Antonio Trande 1.2.3-5.49 -- Update to 1.2.3 sub-49 - -* Sun May 14 2017 Peter Robinson 1.2.3-4.43 -- Bump Release so upgrade path works - -* Fri May 12 2017 Antonio Trande 1.2.3-1.43 -- Update to 1.2.3 sub-43 - -* Wed Apr 05 2017 Jerry James - 1.2.3-3.25 -- Rebuild for ntl 10.3.0 -- Make EVR greater than 1.2.3-3.13 - -* Sun Feb 19 2017 Antonio Trande 1.2.3-1.25 -- Update to 1.2.3 sub-25 - -* Fri Feb 10 2017 Fedora Release Engineering - 1.2.3-3.13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Jan 21 2017 Peter Robinson 1.2.3-2.13 -- Adjust release so it's newer than the previous rev - -* Wed Jan 18 2017 Antonio Trande 1.2.3-1.13 -- Update to 1.2.3 sub-13 - -* Thu Jan 12 2017 Igor Gnatenko - 1.2.3-2.9 -- Rebuild for readline 7.x - -* Thu Jan 05 2017 Antonio Trande 1.2.3-1.9 -- Update to 1.2.3 sub-9 -- Conformed to new rules for scriptlets - -* Sun Dec 25 2016 Antonio Trande 1.2.2-14.105 -- Update to subversion 105 - -* Fri Dec 02 2016 Paul Howarth 1.2.2-13.103 -- Rebuild for pari 2.9.0 - -* Tue Nov 15 2016 Antonio Trande 1.2.2-12.103 -- Update to subversion 103 - -* Thu Oct 20 2016 Jerry James 1.2.2-11.85 -- Rebuild for ntl 10.1.0 -- Add -iszero patch to fix breakage with recent glibc versions - -* Tue Sep 27 2016 Antonio Trande 1.2.2-10.85 -- Update to subversion 85 - -* Mon Sep 05 2016 Jerry James 1.2.2-9.75 -- Rebuild for ntl 9.11.0 - -* Mon Jul 25 2016 Jerry James 1.2.2-8.75 -- Rebuild for ntl 9.10.0 - -* Fri Jul 15 2016 Antonio Trande 1.2.2-7.75 -- Update to subversion 75 - -* Thu Jul 07 2016 Antonio Trande 1.2.2-6.63 -- Exclude s390x - -* Sat Jul 02 2016 Antonio Trande 1.2.2-5.63 -- Fix directories ownership -- Exclude PPC and aarch64 - -* Thu Jun 30 2016 Antonio Trande 1.2.2-4.63 -- Update to subversion 63 -- Add libXinerama BR -- Fix co-owning of documentation sub-directories -- Fix appdata file -- Add Provides tags - -* Thu May 19 2016 Antonio Trande 1.2.2-3.45 -- Source tarball repacked without non-free docs -- Licenses combined in GPLv3+ only - -* Fri May 13 2016 Antonio Trande 1.2.2-2 -- Fix required package of pgiac - -* Fri May 13 2016 Antonio Trande 1.2.2-1 -- Update to 1.2.2 -- pgiac script packaged separately -- Fix cSolveorder check -- Update scriptlets -- Add appdata file -- Excluded PPC and aarch64 -- Drop the filesystem sub-package - -* Sun Jul 6 2014 Frederic Han 1.1.1-1 -- Update to current stable upstream version. Remove obsolete patches. -- Add mpfi-devel dependency. (New feature in 1.1.1) -- Add requires of hicolor-icon-theme instead of owning dirs. - -* Sun Apr 27 2014 Frederic Han 1.1.0-1 -- Let the doc package be independent of the binary packages. So create - a filesystem package containing the shared directories - -* Wed Apr 16 2014 Frederic Han 1.1.0-1 -- Dont delete intl/Makefile to avoid Makefile and configure modif/rebuilt -- Create a file list: giacdocfile for giac/doc files that are not needed - at runtime -- Remove %%dir %%{_datadir}/mime and %%dir %%{_datadir}/mime/packages from - giac-xcas package list - -* Mon Apr 14 2014 Frederic Han 1.1.0-1 -- Add tinymt32 License in %%doc, and LGPLv2+ tag -- Add gettext-devel in BR and disable included intl -- removed doc/*/texinfo.tex, add BR texinfo, and rebuild *.info with - the system texinfo.tex file for License clarity, also convert them to utf-8 -- Add missing %%dir in %%files xcas and %%files -- Fix unused-direct-shlib-dependency for libgiac -- Remove x perms in examples, clean backup files -- Move the mime and desktop updates to %%post xcas and %%postun xcas -- Add a warning to *not* try to convert .xws files to UTF-8 - -* Fri Apr 11 2014 Frederic Han 1.1.0-1 -- Initial version -- Found GPLv3 and v2 files in 1.1.0 sources. So package the GPLv3 LICENSE. -- Put GPLv3+ tag on the -doc package according to 1.1.1. -- Rename the package giac-gui to giac-xcas. -- Add a check patch and make check. -- Some files of %%{_datadir}/giac are need at runtime. So, - add them in the main or -xcas package filelist. -- Move all the %%{_docdir}/giac files except LICENSE to the -doc package -- Add extra pdf doc found in source archive. -- Untabify spec file. -- remove the README patch to keep the original 1.1.0 unchanged. add a README.fedora - to explain the License evolution of giac non FR doc. -- Improve giac.1 manpage. +%autochangelog diff --git a/sources b/sources index 8ab7649..a90ca4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.99.tar.gz) = f165ae7a9be0aa702a912a09990243b7ad456f326ca97bae089ba1e8b6b1f9641355aca0f7afe38d12e0fc97da3a92519cf335e53e59582447bf7af66640cd32 +SHA512 (giac-1.9.0.992.tar.gz) = bdc360bba13ef64d76d4b9591b3a9163995f997fdf7c24a80d318357cf2a507f8e1c4c3033ae25f2d6e4f7d38395ee10598dd903f39f6b8c7a8b4887bc0524bb From c69f4884fb76dd53e222ea9585edd2c2ab86e3eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 02:17:56 +0000 Subject: [PATCH 17/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b8b33eb59c5146ceae86f7e191b061ba12704fce Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 23 Sep 2024 11:46:38 -0600 Subject: [PATCH 18/46] Rebuild for nauty 2.8.9 From e3459529f6a61cf21e85e1fbd496c446432f0d0c Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 3 Oct 2024 21:47:08 +0200 Subject: [PATCH 19/46] Release 1.9.0.993| Patch mkjs file --- .gitignore | 1 + giac-faking_mkjs.patch | 22 ++++++++++++++++++++++ giac-makesrc.sh | 4 ++-- giac.spec | 13 ++++++++++++- sources | 2 +- 5 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 giac-faking_mkjs.patch diff --git a/.gitignore b/.gitignore index c5333a2..56b9ef6 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /giac-1.9.0.97.tar.gz /giac-1.9.0.99.tar.gz /giac-1.9.0.992.tar.gz +/giac-1.9.0.993.tar.gz diff --git a/giac-faking_mkjs.patch b/giac-faking_mkjs.patch new file mode 100644 index 0000000..4978d74 --- /dev/null +++ b/giac-faking_mkjs.patch @@ -0,0 +1,22 @@ +--- a/src/Makefile.orig.am 2024-05-13 08:25:27.000000000 +0200 ++++ b/src/Makefile.am 2024-07-16 21:37:38.681076855 +0200 +@@ -71,7 +71,7 @@ + ./mkjs + + mkjs: mkjs.cc +- g++ mkjs.cc -o mkjs ++ g++ mkjs.cc -o mkjs.fake + + AM_CPPFLAGS = -DIN_GIAC -I$(srcdir) -I$(top_srcdir) -I$(builddir) \ + -I$(top_builddir) $(GMP_CFLAGS) $(NTL_CFLAGS) \ +--- a/src/Makefile.orig.in 2024-05-23 17:09:52.000000000 +0200 ++++ b/src/Makefile.in 2024-07-16 21:36:49.122491632 +0200 +@@ -1470,7 +1470,7 @@ + ./mkjs + + mkjs: mkjs.cc +- g++ mkjs.cc -o mkjs ++ g++ mkjs.cc -o mkjs.fake + + install-exec-hook: + rm -f $(DESTDIR)$(bindir)/cas_help diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 1c3c1b2..9f07b88 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.9.0" -VERSIONREV="992" +VERSIONREV="993" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" @@ -25,7 +25,7 @@ ORIGDIR=`pwd` cd "$TARGET" echo >&2 "Downloading upstream source ..." -wget "http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac$SOURCEORIG.tar.gz" +wget "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source//giac$SOURCEORIG.tar.gz" echo >&2 "Untar upstream source ..." diff --git a/giac.spec b/giac.spec index 35b370c..0bef97b 100644 --- a/giac.spec +++ b/giac.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} -%global subversion .992 +%global subversion .993 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry @@ -50,6 +50,10 @@ Patch5: %{name}-pari2.15.patch # https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=3&t=2895 Patch6: %{name}-undefine_GLIBCXX_ASSERTIONS.patch +# 'mkjs' is not correctly compiled +# https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2930 +Patch7: %{name}-faking_mkjs.patch + BuildRequires: autoconf, libtool BuildRequires: python3-devel BuildRequires: readline-devel @@ -180,6 +184,7 @@ with Giac computations. %patch -P 4 -p1 -b .backup %patch -P 5 -p1 -b .backup %patch -P 6 -p1 -b .backup +%patch -P 7 -p1 -b .backup # Remove local intl (already bundled in fedora) rm -rf intl/*.h @@ -237,6 +242,12 @@ export CFLAGS_FEDORA="$OPT_FLAGS" sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +# Compile 'mkjs' executable +# See patch7's comment +export OPT_FLAGS=$(echo "%build_cxxflags" | %{__sed} -e 's/-Werror=format-security/-Wno-error=format-security/') +g++ $OPT_FLAGS -std=gnu++14 src/mkjs.cc -o src/mkjs +# + # https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2817 OPT_FLAGS=$(echo "%build_cflags" | %{__sed} -e 's/-Werror=format-security/-Wno-error=format-security/') export CXXFLAGS="$OPT_FLAGS -std=gnu++14" diff --git a/sources b/sources index a90ca4f..caaa507 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.992.tar.gz) = bdc360bba13ef64d76d4b9591b3a9163995f997fdf7c24a80d318357cf2a507f8e1c4c3033ae25f2d6e4f7d38395ee10598dd903f39f6b8c7a8b4887bc0524bb +SHA512 (giac-1.9.0.993.tar.gz) = 2fcc5199ef0cd6811b5fd231c316c1ca0279c85216f6cf46b332fb562f55d21945f5c8f26d1a61aa4e0db897602ffd0b4c1b54e9a9ac1c2796f469d1a6493f83 From 45b75e7fe278a2c796dd306b5484c1f1464ca6cd Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 5 Oct 2024 11:30:40 -0600 Subject: [PATCH 20/46] Rebuild for pari 2.17.0 From 791bac78ac18e3ddcb7878dbd5f036d219940825 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 7 Nov 2024 21:23:05 +0100 Subject: [PATCH 21/46] Update Patch6| Exclude micropython in PPC64 --- giac.spec | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/giac.spec b/giac.spec index 0bef97b..17366f7 100644 --- a/giac.spec +++ b/giac.spec @@ -1,6 +1,6 @@ # Tests excluded # See https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=19&t=1733 -%bcond_with check +%bcond_without check %bcond_without flexiblas @@ -236,7 +236,10 @@ export CFLAGS_FEDORA="$OPT_FLAGS" --enable-tommath=no --enable-debug=no --enable-gc=no --enable-sscl=no \ --enable-dl=yes --enable-gsl=yes --enable-lapack=yes --enable-pari=yes \ --enable-ntl=yes --enable-gmpxx=yes --enable-cocoa=autodetect \ - --enable-gui=yes --disable-rpath + --enable-gui=yes --disable-rpath \ +%ifarch %{power64} + --disable-micropy +%endif # The --disable-rpath option of configure was not enough to get rid of the hardcoded libdir sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -268,7 +271,9 @@ done %make_install # Install libmicropython.a library +%ifnarch %{power64} install -pm 644 libmicropython.a %{buildroot}%{_libdir}/ +%endif # Install libxcas.a library install -pm 644 src/.libs/libxcas.a %{buildroot}%{_libdir}/ @@ -312,10 +317,10 @@ install -pm 644 -t %{buildroot}%{_datadir}/giac/doc/es doc/es/*.pdf # Symlinks used by QCAS and giacpy mkdir -p %{buildroot}%{_datadir}/giac/doc/fr -ln -sf -T %{_datadir}/giac/doc/aide_cas %{buildroot}%{_datadir}/giac/doc/fr/aide_cas -ln -sf -T %{_datadir}/giac/doc/aide_cas %{buildroot}%{_datadir}/giac/doc/en/aide_cas -ln -sf -T %{_datadir}/giac/doc/en/casinter/index.html %{buildroot}%{_datadir}/giac/doc/en/casinter/casinter.html -ln -sf -T %{_datadir}/giac/doc/en/cascmd_en/index.html %{buildroot}%{_datadir}/giac/doc/en/cascmd_en/cascmd_en.html +ln -srf -T %{_datadir}/giac/doc/aide_cas %{buildroot}%{_datadir}/giac/doc/fr/aide_cas +ln -srf -T %{_datadir}/giac/doc/aide_cas %{buildroot}%{_datadir}/giac/doc/en/aide_cas +ln -srf -T %{_datadir}/giac/doc/en/casinter/index.html %{buildroot}%{_datadir}/giac/doc/en/casinter/casinter.html +ln -srf -T %{_datadir}/giac/doc/en/cascmd_en/index.html %{buildroot}%{_datadir}/giac/doc/en/cascmd_en/cascmd_en.html # # DOC Files (1-4): @@ -371,8 +376,10 @@ find %{buildroot}%{_datadir}/giac/doc -maxdepth 2 -type l| \ %if %{with check} %check -export LD_LIBRARY_PATH=../src/.libs +export LD_LIBRARY_PATH=%{buildroot}%{_libdir} make -C check check +# This is for debugging purpose +#make -C check check && exit 1 %endif %files -f %{name}.lang @@ -385,7 +392,9 @@ make -C check check %{_libdir}/libgiac.so.0.0.0 %{_libdir}/libgiac.so.0 %{_libdir}/libgiac.a +%ifnarch %{power64} %{_libdir}/libmicropython.a +%endif %{_libdir}/libxcas.a # The following files are required at runtime by icas AND xcas. # (Ex: if LANG is fr, alea(5) should give an INT) From 7138386e208a41398d3d04f1c2d96f95a83361c7 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 7 Nov 2024 23:52:51 +0100 Subject: [PATCH 22/46] Change debug scanning command --- giac.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 17366f7..1ca0c11 100644 --- a/giac.spec +++ b/giac.spec @@ -379,7 +379,7 @@ find %{buildroot}%{_datadir}/giac/doc -maxdepth 2 -type l| \ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} make -C check check # This is for debugging purpose -#make -C check check && exit 1 +cat check/test-suite.log && exit 1 %endif %files -f %{name}.lang From 93c46cd595be2a4f643379cd49043a496e630b76 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 13 Nov 2024 19:34:42 +0100 Subject: [PATCH 23/46] Disable debugging --- giac.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 1ca0c11..d0f7bb6 100644 --- a/giac.spec +++ b/giac.spec @@ -379,7 +379,7 @@ find %{buildroot}%{_datadir}/giac/doc -maxdepth 2 -type l| \ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} make -C check check # This is for debugging purpose -cat check/test-suite.log && exit 1 +# cat check/test-suite.log && exit 1 %endif %files -f %{name}.lang From 4909aa66bf8039ea21f005e21a737cecb52a852c Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 13 Nov 2024 21:07:53 +0100 Subject: [PATCH 24/46] Enable debugging --- giac.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index d0f7bb6..1ca0c11 100644 --- a/giac.spec +++ b/giac.spec @@ -379,7 +379,7 @@ find %{buildroot}%{_datadir}/giac/doc -maxdepth 2 -type l| \ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} make -C check check # This is for debugging purpose -# cat check/test-suite.log && exit 1 +cat check/test-suite.log && exit 1 %endif %files -f %{name}.lang From 9da66417d2287050adc0fee4f10152fc12134d77 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 13 Nov 2024 21:30:56 +0100 Subject: [PATCH 25/46] Make check always passed --- giac.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/giac.spec b/giac.spec index 1ca0c11..378fc46 100644 --- a/giac.spec +++ b/giac.spec @@ -377,8 +377,9 @@ find %{buildroot}%{_datadir}/giac/doc -maxdepth 2 -type l| \ %if %{with check} %check export LD_LIBRARY_PATH=%{buildroot}%{_libdir} -make -C check check -# This is for debugging purpose +#make -C check check +# This is for debugging purpose only +make -C check check && exit 1 cat check/test-suite.log && exit 1 %endif From 94636c6fde7c07bf4bfacd7059ea046113b9678f Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 14 Nov 2024 20:56:55 +0100 Subject: [PATCH 26/46] Update giac-undefine_GLIBCXX_ASSERTIONS.patch --- giac-undefine_GLIBCXX_ASSERTIONS.patch | 21 +++++++++++++++++++++ giac.spec | 6 +++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/giac-undefine_GLIBCXX_ASSERTIONS.patch b/giac-undefine_GLIBCXX_ASSERTIONS.patch index 76ae2d4..a629079 100644 --- a/giac-undefine_GLIBCXX_ASSERTIONS.patch +++ b/giac-undefine_GLIBCXX_ASSERTIONS.patch @@ -14,3 +14,24 @@ #if defined NUMWORKS && !defined SDL_KHICAS #define KHICAS 1 +--- a/src/vecteur.orig.cc 2024-06-04 08:13:22.000000000 +0200 ++++ b/src/vecteur.cc 2024-11-01 17:58:56.061073533 +0100 +@@ -8498,15 +8498,15 @@ + } + else { + int C=col+1; +- longlong * ptr= &buffer[C],*ptrend=&buffer[0]+cmax-4; +- const int *ptrN=&Nline[C]; ++ longlong * ptr= &buffer[0]+C,*ptrend=&buffer[0]+cmax-4; ++ const int *ptrN=&Nline[0]+C; + for (;ptr Date: Thu, 16 Jan 2025 21:56:39 +0000 Subject: [PATCH 27/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 18f686dc49f8cf717f91204f896c58cbc4ea5cc5 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 19 Jan 2025 18:09:34 +0100 Subject: [PATCH 28/46] Release 1.9.0.998 --- .gitignore | 1 + giac-makesrc.sh | 2 +- giac-undefine_GLIBCXX_ASSERTIONS.patch | 6 +++--- giac.spec | 16 ++++++++++------ sources | 2 +- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 56b9ef6..f306fb8 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /giac-1.9.0.99.tar.gz /giac-1.9.0.992.tar.gz /giac-1.9.0.993.tar.gz +/giac-1.9.0.998.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 9f07b88..2a36712 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.9.0" -VERSIONREV="993" +VERSIONREV="998" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac-undefine_GLIBCXX_ASSERTIONS.patch b/giac-undefine_GLIBCXX_ASSERTIONS.patch index a629079..1b36832 100644 --- a/giac-undefine_GLIBCXX_ASSERTIONS.patch +++ b/giac-undefine_GLIBCXX_ASSERTIONS.patch @@ -1,8 +1,8 @@ --- a/src/first.orig.h 2023-05-24 09:52:40.000000000 +0200 +++ b/src/first.h 2024-02-10 19:37:26.376884368 +0100 -@@ -22,12 +22,7 @@ - #define _GIAC_FIRST_H_ - +@@ -27,12 +27,7 @@ + #endif + // register is deprecated in c++17 -#define register - diff --git a/giac.spec b/giac.spec index d2b0233..2980fde 100644 --- a/giac.spec +++ b/giac.spec @@ -1,12 +1,16 @@ # Tests excluded # See https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=19&t=1733 +%ifarch s390x +%bcond_with check +%else %bcond_without check +%endif %bcond_without flexiblas %global _lto_cflags %{nil} -%global subversion .993 +%global subversion .998 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry @@ -230,8 +234,8 @@ autoreconf -ivf %build # https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2817 OPT_FLAGS=$(echo "%build_cxxflags" | %{__sed} -e 's/-Werror=format-security/-Wno-error=format-security/') -export CXXFLAGS="$OPT_FLAGS -std=gnu++14" -export CFLAGS_FEDORA="$OPT_FLAGS" +export CXXFLAGS="$OPT_FLAGS -std=gnu++17" +export CFLAGS_FEDORA="$OPT_FLAGS -std=gnu17" %configure --enable-static=yes --with-included-gettext=no --enable-nls=yes \ --enable-tommath=no --enable-debug=no --enable-gc=no --enable-sscl=no \ --enable-dl=yes --enable-gsl=yes --enable-lapack=yes --enable-pari=yes \ @@ -248,13 +252,13 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # Compile 'mkjs' executable # See patch7's comment export OPT_FLAGS=$(echo "%build_cxxflags" | %{__sed} -e 's/-Werror=format-security/-Wno-error=format-security/') -g++ $OPT_FLAGS -std=gnu++14 src/mkjs.cc -o src/mkjs +g++ $OPT_FLAGS -std=gnu++17 src/mkjs.cc -o src/mkjs # # https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2817 OPT_FLAGS=$(echo "%build_cflags" | %{__sed} -e 's/-Werror=format-security/-Wno-error=format-security/') -export CXXFLAGS="$OPT_FLAGS -std=gnu++14" -export CFLAGS_FEDORA="$OPT_FLAGS" +export CXXFLAGS="$OPT_FLAGS -std=gnu++17" +export CFLAGS_FEDORA="$OPT_FLAGS -std=gnu17" export LDFLAGS_FEDORA="$OPT_FLAGS" %make_build diff --git a/sources b/sources index caaa507..5f2828c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.993.tar.gz) = 2fcc5199ef0cd6811b5fd231c316c1ca0279c85216f6cf46b332fb562f55d21945f5c8f26d1a61aa4e0db897602ffd0b4c1b54e9a9ac1c2796f469d1a6493f83 +SHA512 (giac-1.9.0.998.tar.gz) = 50bb65080c10f1ba5ddb28ffb33ea599ce75603dea1ba6d942a650812266e472ecd3cd7cb926184234f13d6e77ad18cc85b54b9f4d5ba67ec9bf33871ba296cb From 8ab8b4628049ad4a408a798990c23d79ac775f96 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 2 Feb 2025 13:40:52 -0700 Subject: [PATCH 29/46] Rebuild with gsl 2.8 From 859a1174485e8d9616a5c4c3d781eb7f384ee011 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 27 Apr 2025 21:03:29 +0200 Subject: [PATCH 30/46] Release 1.9.0.999 --- .gitignore | 1 + giac-makesrc.sh | 2 +- giac.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f306fb8..64f9fef 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /giac-1.9.0.992.tar.gz /giac-1.9.0.993.tar.gz /giac-1.9.0.998.tar.gz +/giac-1.9.0.999.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 2a36712..149c8b1 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.9.0" -VERSIONREV="998" +VERSIONREV="999" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index 2980fde..20526e8 100644 --- a/giac.spec +++ b/giac.spec @@ -10,7 +10,7 @@ %global _lto_cflags %{nil} -%global subversion .998 +%global subversion .999 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry diff --git a/sources b/sources index 5f2828c..28f672e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.998.tar.gz) = 50bb65080c10f1ba5ddb28ffb33ea599ce75603dea1ba6d942a650812266e472ecd3cd7cb926184234f13d6e77ad18cc85b54b9f4d5ba67ec9bf33871ba296cb +SHA512 (giac-1.9.0.999.tar.gz) = 08e5f08473febe164a0cc48c38b2806698a9fa8e04d32cdb8b0fc756e9ebf91e69a7f906a4f449406fd6b3af3f61ff1238fd135d04aff50d2e7742a3d0bc34fd From 2ec7f15e0017d3a9029870b859471cfb4fe73ac8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 22:20:10 +0000 Subject: [PATCH 31/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From b04f188ff8a992bb8d21e4a12da7131f6d3f8ebc Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 30 Jul 2025 13:16:50 -0600 Subject: [PATCH 32/46] Rebuild for nauty 2.9.0 From dbf1441cb62be4bf95799f469cce926bb9f4a02e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 1 Aug 2025 11:46:27 -0600 Subject: [PATCH 33/46] Stop building for 32-bit x86 --- giac.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/giac.spec b/giac.spec index 20526e8..13be58a 100644 --- a/giac.spec +++ b/giac.spec @@ -58,6 +58,9 @@ Patch6: %{name}-undefine_GLIBCXX_ASSERTIONS.patch # https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2930 Patch7: %{name}-faking_mkjs.patch +# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + BuildRequires: autoconf, libtool BuildRequires: python3-devel BuildRequires: readline-devel From a3f5efc33122add4716493be1858a2c4601691b6 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 17 Sep 2025 16:45:24 -0600 Subject: [PATCH 34/46] Rebuild for nauty 2.9.1 From d65650d33184a910e889939ece37e90f9e15bf85 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sat, 27 Sep 2025 14:39:10 +0200 Subject: [PATCH 35/46] Rebuild for libnauty-2.9.1 From b35c72a01e940aef96a44f0bfa82a719c239dfdb Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 19 Nov 2025 21:02:11 -0700 Subject: [PATCH 36/46] Rebuild for ntl 11.6.0 From 1612ae7f7e435c3cb367cea0d9f2baf985ac3a2d Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 4 Dec 2025 11:39:13 +0100 Subject: [PATCH 37/46] Release 2.0.0 rev. 17 --- .gitignore | 1 + giac-makesrc.sh | 7 +++---- giac.spec | 37 ++++++++++++++++++++++--------------- sources | 2 +- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 64f9fef..beaa400 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /giac-1.9.0.993.tar.gz /giac-1.9.0.998.tar.gz /giac-1.9.0.999.tar.gz +/giac-2.0.0.17.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 149c8b1..9bb6a2c 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -4,8 +4,8 @@ # package maintainer. # -VERSION="1.9.0" -VERSIONREV="999" +VERSION="2.0.0" +VERSIONREV="17" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" @@ -25,8 +25,7 @@ ORIGDIR=`pwd` cd "$TARGET" echo >&2 "Downloading upstream source ..." -wget "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source//giac$SOURCEORIG.tar.gz" - +wget "https://www-fourier.univ-grenoble-alpes.fr/~parisse/debian/dists/stable/main/source/giac$SOURCEORIG.tar.gz" echo >&2 "Untar upstream source ..." tar -xzf giac"$SOURCEORIG".tar.gz diff --git a/giac.spec b/giac.spec index 13be58a..4dbfc13 100644 --- a/giac.spec +++ b/giac.spec @@ -10,11 +10,11 @@ %global _lto_cflags %{nil} -%global subversion .999 +%global subversion .17 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry -Version: 1.9.0%{subversion} +Version: 2.0.0%{subversion} Release: %autorelease # GPL-3.0-or-later: the project as a whole # GPL-3.0-only: src/TmpFGLM.*, src/TmpLESystemSolver.* @@ -26,9 +26,9 @@ Release: %autorelease # MIT: micropython-1.12/, src/cutils.*, src/js.c, src/libbf.*, src/libregexp*, # src/libunicode.*, src/list.h, src/qjs*, src/quickjs* License: GPL-3.0-or-later AND GPL-3.0-only AND GPL-2.0-or-later AND (GPL-1.0-or-later OR Artistic-1.0-Perl) AND LGPL-3.0-or-later AND LGPL-2.0-or-later AND MIT -URL: http://www-fourier.ujf-grenoble.fr/~parisse/giac.html +URL: https://www-fourier.univ-grenoble-alpes.fr/~parisse/giac.html ## Source package is downloaded from -## http://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/ +## https://www-fourier.univ-grenoble-alpes.fr/~parisse/debian/dists/stable/main/source ## and re-packed without non-free FR documentation by giac-makesrc script. Source0: %{name}-%{version}.tar.gz Source1: %{name}-makesrc.sh @@ -64,7 +64,7 @@ ExcludeArch: %{ix86} BuildRequires: autoconf, libtool BuildRequires: python3-devel BuildRequires: readline-devel -BuildRequires: gettext-devel +BuildRequires: gettext BuildRequires: gcc-c++ BuildRequires: make BuildRequires: cliquer-devel @@ -237,9 +237,9 @@ autoreconf -ivf %build # https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2817 OPT_FLAGS=$(echo "%build_cxxflags" | %{__sed} -e 's/-Werror=format-security/-Wno-error=format-security/') -export CXXFLAGS="$OPT_FLAGS -std=gnu++17" +export CXXFLAGS="$OPT_FLAGS -fpermissive -std=gnu++17" export CFLAGS_FEDORA="$OPT_FLAGS -std=gnu17" -%configure --enable-static=yes --with-included-gettext=no --enable-nls=yes \ +%configure --enable-static=yes --with-included-gettext=no --enable-nls=no \ --enable-tommath=no --enable-debug=no --enable-gc=no --enable-sscl=no \ --enable-dl=yes --enable-gsl=yes --enable-lapack=yes --enable-pari=yes \ --enable-ntl=yes --enable-gmpxx=yes --enable-cocoa=autodetect \ @@ -255,12 +255,12 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # Compile 'mkjs' executable # See patch7's comment export OPT_FLAGS=$(echo "%build_cxxflags" | %{__sed} -e 's/-Werror=format-security/-Wno-error=format-security/') -g++ $OPT_FLAGS -std=gnu++17 src/mkjs.cc -o src/mkjs +g++ $OPT_FLAGS -fpermissive -std=gnu++17 src/mkjs.cc -o src/mkjs # # https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2817 OPT_FLAGS=$(echo "%build_cflags" | %{__sed} -e 's/-Werror=format-security/-Wno-error=format-security/') -export CXXFLAGS="$OPT_FLAGS -std=gnu++17" +export CXXFLAGS="$OPT_FLAGS -fpermissive -std=gnu++17" export CFLAGS_FEDORA="$OPT_FLAGS -std=gnu17" export LDFLAGS_FEDORA="$OPT_FLAGS" %make_build @@ -322,6 +322,8 @@ install -pm 644 -t %{buildroot}%{_datadir}/giac/doc/en doc/en/*.pdf install -pm 644 -t %{buildroot}%{_datadir}/giac/doc/el doc/el/*.pdf install -pm 644 -t %{buildroot}%{_datadir}/giac/doc/es doc/es/*.pdf +find %{buildroot}%{_datadir}/giac -name 'Makefile*' -exec rm {} \; + # Symlinks used by QCAS and giacpy mkdir -p %{buildroot}%{_datadir}/giac/doc/fr ln -srf -T %{_datadir}/giac/doc/aide_cas %{buildroot}%{_datadir}/giac/doc/fr/aide_cas @@ -340,10 +342,11 @@ install -pm 644 debian/pgiac.1 %{buildroot}%{_mandir}/man1 # Add a link for FR env users to have the english help instead of a page # not found. -mkdir -p %{buildroot}%{_datadir}/giac/doc/fr -(cd %{buildroot}%{_datadir}/giac/doc/fr ; ln -s ../en/cascmd_en cascmd_fr ) +pushd %{buildroot}%{_datadir}/giac/doc/fr +ln -s ../en/cascmd_en cascmd_fr +popd -%find_lang %{name} +#find_lang %%{name} desktop-file-install --vendor="" --remove-key=Encoding \ --set-key=Version --set-value=1.0 \ --dir=%{buildroot}%{_datadir}/applications/ \ @@ -386,11 +389,11 @@ find %{buildroot}%{_datadir}/giac/doc -maxdepth 2 -type l| \ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} make -C check check # This is for debugging purpose only -#make -C check check && exit 1 -#cat check/test-suite.log && exit 1 +#make -j1 -C check check +#cat check/test-suite.log %endif -%files -f %{name}.lang +%files %license COPYING micropython-1.12/micropython-LICENSE %license LICENSE.tinymt32 %{_bindir}/icas @@ -399,6 +402,8 @@ make -C check check %{_bindir}/*_help %{_libdir}/libgiac.so.0.0.0 %{_libdir}/libgiac.so.0 +%{_libdir}/libxcas.so.0.0.0 +%{_libdir}/libxcas.so.0 %{_libdir}/libgiac.a %ifnarch %{power64} %{_libdir}/libmicropython.a @@ -430,6 +435,7 @@ make -C check check # The gui files %files xcas %{_bindir}/xcas +%{_datadir}/giac/xcas.html # The dirs shared %dir %{_datadir}/giac %dir %{_datadir}/giac/doc @@ -461,6 +467,7 @@ make -C check check %files devel %{_includedir}/giac/ %{_libdir}/libgiac.so +%{_libdir}/libxcas.so # DOC Files %files doc -f giacdoclist diff --git a/sources b/sources index 28f672e..f3d9b76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.999.tar.gz) = 08e5f08473febe164a0cc48c38b2806698a9fa8e04d32cdb8b0fc756e9ebf91e69a7f906a4f449406fd6b3af3f61ff1238fd135d04aff50d2e7742a3d0bc34fd +SHA512 (giac-2.0.0.17.tar.gz) = 6d435195da40c9d42ecf157a91c9c7d09789fbfc54b139772c3de597893982dbedb0708bd58d5d39605b72d9d6182b25c383aa8744645f311769887c9d0bc414 From cffc52beb22a803b317a55a275f7496ec77774f7 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 4 Dec 2025 17:50:39 +0100 Subject: [PATCH 38/46] Release 2.0.0 rev 18 --- .gitignore | 1 + giac-makesrc.sh | 12 +++++------- giac.spec | 6 +++--- sources | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index beaa400..b0df62e 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /giac-1.9.0.998.tar.gz /giac-1.9.0.999.tar.gz /giac-2.0.0.17.tar.gz +/giac-2.0.0.18.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 9bb6a2c..e7cca4e 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="2.0.0" -VERSIONREV="17" +VERSIONREV="18" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" @@ -20,9 +20,8 @@ if [ -f "$OUTPUTFILEBASENAME".tar.gz -o -f "$OUTPUTFILEBASENAME".tar.bz2 ] ; the fi echo >&2 "Build a temporary working dir" -TARGET=$(mkdir -p "giac-src") -ORIGDIR=`pwd` -cd "$TARGET" +mkdir -p giac-src +cd giac-src echo >&2 "Downloading upstream source ..." wget "https://www-fourier.univ-grenoble-alpes.fr/~parisse/debian/dists/stable/main/source/giac$SOURCEORIG.tar.gz" @@ -59,11 +58,10 @@ touch html_vall echo >&2 "Building giac source tarball ..." cd ../../../ tar -cz giac-"$VERSION" -f "$OUTPUTFILEBASENAME".tar.gz - +mv "giac"$OUTPUTFILEBASENAME".tar.gz" ../ +cd ../ echo >&2 "Cleaning extracted dir ..." rm -rf giac-src -rm -f "giac$SOURCEORIG.tar.gz" -rm -rf giac-"$VERSION" echo >&2 "Finished." diff --git a/giac.spec b/giac.spec index 4dbfc13..a493060 100644 --- a/giac.spec +++ b/giac.spec @@ -10,7 +10,7 @@ %global _lto_cflags %{nil} -%global subversion .17 +%global subversion .18 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry @@ -483,9 +483,9 @@ make -C check check # character encoding. # - The .cas and .cxx files are giac code and function. They are text files # -# NB: %%{_docdir}/giac is in the -filsystem package +# NB: _docdir/giac is in the -filsystem package %{_docdir}/giac/* -# Add all the files that are in %%{_datadir}/giac but not giac/aide_cas +# Add all the files that are in _datadir/giac but not giac/aide_cas # and not those in giac/doc/ %dir %{_datadir}/giac %dir %{_docdir}/giac diff --git a/sources b/sources index f3d9b76..0a2dd00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-2.0.0.17.tar.gz) = 6d435195da40c9d42ecf157a91c9c7d09789fbfc54b139772c3de597893982dbedb0708bd58d5d39605b72d9d6182b25c383aa8744645f311769887c9d0bc414 +SHA512 (giac-2.0.0.18.tar.gz) = 9b92320c21a94c758e4c18d5393c91f5cd2e2eb66c13ad4aeeb66c70bb53181fb8f82e5288a1c18bf4ae870f132baf6af0ffa5940819d40187b045de24503edc From 62e8fbaccd8da26575931f3ca51a936d06ceeacb Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 4 Dec 2025 19:20:14 +0100 Subject: [PATCH 39/46] Fix bad symlinks --- giac.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/giac.spec b/giac.spec index a493060..a22e262 100644 --- a/giac.spec +++ b/giac.spec @@ -3,7 +3,7 @@ %ifarch s390x %bcond_with check %else -%bcond_without check +%bcond_with check %endif %bcond_without flexiblas @@ -326,10 +326,10 @@ find %{buildroot}%{_datadir}/giac -name 'Makefile*' -exec rm {} \; # Symlinks used by QCAS and giacpy mkdir -p %{buildroot}%{_datadir}/giac/doc/fr -ln -srf -T %{_datadir}/giac/doc/aide_cas %{buildroot}%{_datadir}/giac/doc/fr/aide_cas -ln -srf -T %{_datadir}/giac/doc/aide_cas %{buildroot}%{_datadir}/giac/doc/en/aide_cas -ln -srf -T %{_datadir}/giac/doc/en/casinter/index.html %{buildroot}%{_datadir}/giac/doc/en/casinter/casinter.html -ln -srf -T %{_datadir}/giac/doc/en/cascmd_en/index.html %{buildroot}%{_datadir}/giac/doc/en/cascmd_en/cascmd_en.html +ln -sf -T %{_datadir}/giac/doc/aide_cas %{buildroot}%{_datadir}/giac/doc/fr/aide_cas +ln -sf -T %{_datadir}/giac/doc/aide_cas %{buildroot}%{_datadir}/giac/doc/en/aide_cas +ln -sf -T %{_datadir}/giac/doc/en/casinter/index.html %{buildroot}%{_datadir}/giac/doc/en/casinter/casinter.html +ln -sf -T %{_datadir}/giac/doc/en/cascmd_en/index.html %{buildroot}%{_datadir}/giac/doc/en/cascmd_en/cascmd_en.html # # DOC Files (1-4): From b7bd5bc62318f9bd2c3096ce5d171912cddadb50 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 4 Dec 2025 21:14:11 +0100 Subject: [PATCH 40/46] Move khicas.nwa file to arch dependent sub-package --- giac.spec | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/giac.spec b/giac.spec index a22e262..53d62e0 100644 --- a/giac.spec +++ b/giac.spec @@ -142,6 +142,7 @@ BuildArch: noarch BuildRequires: hevea %endif BuildRequires: tex(latex), texinfo, texinfo-tex, texlive-stmaryrd +Requires: %{name} = %{version}-%{release} # Javascript provided Provides: bundled(CodeMirror) @@ -346,6 +347,12 @@ pushd %{buildroot}%{_datadir}/giac/doc/fr ln -s ../en/cascmd_en cascmd_fr popd +# khicas.nwa is an arch-dependent executable file (ELF 32-bit LSB relocatable, ARM, EABI5 version 1) +# I moving it from noarch giac-doc to giac package +mkdir -p %{buildroot}%{_libexecdir}/giac +cp --no-preserve=0755 %{buildroot}%{_datadir}/giac/doc/khicas.nwa %{buildroot}%{_libexecdir}/giac/ +ln -sfv %{_libexecdir}/giac/khicas.nwa %{buildroot}%{_datadir}/giac/doc/khicas.nwa + #find_lang %%{name} desktop-file-install --vendor="" --remove-key=Encoding \ --set-key=Version --set-value=1.0 \ @@ -384,6 +391,10 @@ find %{buildroot}%{_datadir}/giac/doc -maxdepth 2 -type l| \ grep -v -E "%{_datadir}/giac/doc/aide_cas$" | \ sed -e "s:%{buildroot}::" >>giacdoclist +# Change permissions to following files +chmod a+x %{buildroot}%{_datadir}/giac/doc/send18 +chmod a+x %{buildroot}%{_datadir}/giac/doc/send19 + %if %{with check} %check export LD_LIBRARY_PATH=%{buildroot}%{_libdir} @@ -405,6 +416,7 @@ make -C check check %{_libdir}/libxcas.so.0.0.0 %{_libdir}/libxcas.so.0 %{_libdir}/libgiac.a +%{_libexecdir}/giac/khicas.nwa %ifnarch %{power64} %{_libdir}/libmicropython.a %endif From 8f85db5c9d1b22205cf09a4fdb33c4556bfbb29a Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 4 Dec 2025 21:28:23 +0100 Subject: [PATCH 41/46] Fix permissions of khicas.nwa --- giac.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 53d62e0..7b8aacb 100644 --- a/giac.spec +++ b/giac.spec @@ -350,7 +350,8 @@ popd # khicas.nwa is an arch-dependent executable file (ELF 32-bit LSB relocatable, ARM, EABI5 version 1) # I moving it from noarch giac-doc to giac package mkdir -p %{buildroot}%{_libexecdir}/giac -cp --no-preserve=0755 %{buildroot}%{_datadir}/giac/doc/khicas.nwa %{buildroot}%{_libexecdir}/giac/ +cp -p %{buildroot}%{_datadir}/giac/doc/khicas.nwa %{buildroot}%{_libexecdir}/giac/ +chmod a+x %{buildroot}%{_libexecdir}/giac/khicas.nwa ln -sfv %{_libexecdir}/giac/khicas.nwa %{buildroot}%{_datadir}/giac/doc/khicas.nwa #find_lang %%{name} From a417a0e9873e549229e6c0fcc514b53e373df449 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 4 Dec 2025 21:47:45 +0100 Subject: [PATCH 42/46] Do not change permissions of khicas.nwa --- giac.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/giac.spec b/giac.spec index 7b8aacb..7c29a1c 100644 --- a/giac.spec +++ b/giac.spec @@ -351,7 +351,6 @@ popd # I moving it from noarch giac-doc to giac package mkdir -p %{buildroot}%{_libexecdir}/giac cp -p %{buildroot}%{_datadir}/giac/doc/khicas.nwa %{buildroot}%{_libexecdir}/giac/ -chmod a+x %{buildroot}%{_libexecdir}/giac/khicas.nwa ln -sfv %{_libexecdir}/giac/khicas.nwa %{buildroot}%{_datadir}/giac/doc/khicas.nwa #find_lang %%{name} From f90c09525cc875ecac250745b2ab2647915f03d8 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 17 Dec 2025 13:03:33 +0100 Subject: [PATCH 43/46] Fix the conflict between giac-doc packages --- giac.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/giac.spec b/giac.spec index 7c29a1c..74154fc 100644 --- a/giac.spec +++ b/giac.spec @@ -143,6 +143,7 @@ BuildRequires: hevea %endif BuildRequires: tex(latex), texinfo, texinfo-tex, texlive-stmaryrd Requires: %{name} = %{version}-%{release} +Obsoletes: giac-doc < 0:2.0.0.18-6 # Javascript provided Provides: bundled(CodeMirror) From 0b0ed65265c249a39b6d19025c3eac7cfa2f49bc Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 17 Dec 2025 15:50:28 +0100 Subject: [PATCH 44/46] Remove symlink --- giac.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/giac.spec b/giac.spec index 74154fc..d6333e7 100644 --- a/giac.spec +++ b/giac.spec @@ -3,7 +3,7 @@ %ifarch s390x %bcond_with check %else -%bcond_with check +%bcond_without check %endif %bcond_without flexiblas @@ -342,12 +342,6 @@ install -pm 644 debian/giac.1 %{buildroot}%{_mandir}/man1 install -pm 644 debian/cas_help.1 %{buildroot}%{_mandir}/man1 install -pm 644 debian/pgiac.1 %{buildroot}%{_mandir}/man1 -# Add a link for FR env users to have the english help instead of a page -# not found. -pushd %{buildroot}%{_datadir}/giac/doc/fr -ln -s ../en/cascmd_en cascmd_fr -popd - # khicas.nwa is an arch-dependent executable file (ELF 32-bit LSB relocatable, ARM, EABI5 version 1) # I moving it from noarch giac-doc to giac package mkdir -p %{buildroot}%{_libexecdir}/giac From 594d450fbbe3eef32798dd2169b9209ffc1bee75 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 17 Dec 2025 22:29:00 +0100 Subject: [PATCH 45/46] Use fdupes --- giac.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/giac.spec b/giac.spec index d6333e7..fab71dd 100644 --- a/giac.spec +++ b/giac.spec @@ -3,7 +3,7 @@ %ifarch s390x %bcond_with check %else -%bcond_without check +%bcond_with check %endif %bcond_without flexiblas @@ -68,6 +68,7 @@ BuildRequires: gettext BuildRequires: gcc-c++ BuildRequires: make BuildRequires: cliquer-devel +BuildRequires: fdupes %ifnarch %{ix86} BuildRequires: cocoalib-devel %endif @@ -136,14 +137,14 @@ Development files for libgiac. #################### %package doc -Summary: Detailed html documentation for Giac/Xcas +Summary: Detailed HTML documentation for Giac/Xcas BuildArch: noarch %ifnarch %{ix86} BuildRequires: hevea %endif BuildRequires: tex(latex), texinfo, texinfo-tex, texlive-stmaryrd Requires: %{name} = %{version}-%{release} -Obsoletes: giac-doc < 0:2.0.0.18-6 +Obsoletes: giac-doc < 0:2.0.0.18-8 # Javascript provided Provides: bundled(CodeMirror) @@ -151,7 +152,7 @@ Provides: bundled(FileSaver.js) License: GPL-3.0-or-later AND GFDL-1.1-or-later %description doc -The detailled html documentation and examples for giac and xcas. It is directly +The detailed documentation and examples for giac and xcas. It is directly accessible from xcas in many ways (browser, context search, thematic indexes). It is strongly recommended for xcas usage. Note that the french part has been removed from the original source due to non free Licence. @@ -169,7 +170,7 @@ Requires: hicolor-icon-theme Xcas is the Fltk graphic user interface to the computer algebra system giac. It supports formal computations, interactive 2D geometry, 3D plotting, spreadsheets with formal calculus and a Logo mode. There is also a programming -editor, and many ways to consult the html help. +editor, and many ways to consult the HTML help. #################### %package -n pgiac @@ -180,7 +181,7 @@ BuildRequires: perl-generators Requires: %{name} = %{version}-%{release} %description -n pgiac -The pgiac command is a perl script to mix Latex documents +The pgiac command is a Perl script to mix Latex documents with Giac computations. %prep @@ -390,6 +391,9 @@ find %{buildroot}%{_datadir}/giac/doc -maxdepth 2 -type l| \ chmod a+x %{buildroot}%{_datadir}/giac/doc/send18 chmod a+x %{buildroot}%{_datadir}/giac/doc/send19 +# Symlink duplicated files +%fdupes -s %{buildroot}%{_datadir} + %if %{with check} %check export LD_LIBRARY_PATH=%{buildroot}%{_libdir} From 73dd11722db5fe9b34812089b3b93f3b35af9820 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 8 Jan 2026 13:44:01 -0700 Subject: [PATCH 46/46] Rebuild for nauty 2.9.3