From 791bac78ac18e3ddcb7878dbd5f036d219940825 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 7 Nov 2024 21:23:05 +0100 Subject: [PATCH 01/26] 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 02/26] 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 03/26] 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 04/26] 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 05/26] 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 06/26] 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 07/26] 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 08/26] 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 09/26] 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 10/26] 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 11/26] 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 12/26] 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 13/26] 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 14/26] 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 15/26] 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 16/26] 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 17/26] 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 18/26] 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 19/26] 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 20/26] 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 21/26] 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 22/26] 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 23/26] 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 24/26] 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 25/26] 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 26/26] Rebuild for nauty 2.9.3