From af98520c9434dd8880479f20304e532980a8b0b4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 2 Jun 2018 10:47:31 -0600 Subject: [PATCH 001/104] Rebuild for libfplll 5.2.1 and mpfi 1.5.3. --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 4516bcc..6952ea4 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.4.9%{subversion} -Release: 1%{?dist} +Release: 2%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -391,6 +391,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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) From b5c0efadcf82b7d8a070a4c7c6c5b7abb69dba86 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 3 Jul 2018 19:38:59 -0600 Subject: [PATCH 002/104] Build with CoCoAlib, glpk, and libao support. Remove scriptlets that call install-info. --- giac-cocoa.patch | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ giac.spec | 30 +++++++++------------ 2 files changed, 81 insertions(+), 17 deletions(-) create mode 100644 giac-cocoa.patch diff --git a/giac-cocoa.patch b/giac-cocoa.patch new file mode 100644 index 0000000..960ebb3 --- /dev/null +++ b/giac-cocoa.patch @@ -0,0 +1,68 @@ +--- configure.orig 2017-11-21 23:57:49.000000000 -0700 ++++ configure 2018-06-10 15:03:48.540821997 -0600 +@@ -16249,7 +16249,7 @@ fi + + + if test "$CONFIG_COCOA" = "yes"; then +- ac_fn_cxx_check_header_mongrel "$LINENO" "CoCoA/io.H" "ac_cv_header_CoCoA_io_H" "$ac_includes_default" ++ ac_fn_cxx_check_header_mongrel "$LINENO" "CoCoA/ring.H" "ac_cv_header_CoCoA_io_H" "$ac_includes_default" + if test "x$ac_cv_header_CoCoA_io_H" = xyes; then : + + else +--- src/cocoa.cc.orig 2017-12-15 01:30:15.000000000 -0700 ++++ src/cocoa.cc 2018-06-10 15:22:44.382283320 -0600 +@@ -25,7 +25,8 @@ + #include + #include + #include +-#include ++#include ++#include + #include + #include "TmpFGLM.H" + #endif +--- src/TmpFGLM.C.orig 2014-04-09 07:24:39.000000000 -0600 ++++ src/TmpFGLM.C 2018-06-10 18:39:12.490590550 -0600 +@@ -32,6 +32,7 @@ + #include "CoCoA/RingDistrMPolyInlPP.H" + #include "CoCoA/RingHom.H" + #include "CoCoA/SparsePolyRing.H" ++#include "CoCoA/SparsePolyOps-ideal.H" + + // #include + using std::size_t; +@@ -81,7 +82,7 @@ namespace CoCoADortmund + // ToDo: Avoid this tedious if-else block + if (entry == MatrixMap.end()) + { +- ring K = CoeffRing(AsSparsePolyRing(owner(p))); ++ ring K = CoeffRing(SparsePolyRing(owner(p))); + struct MatrixMapEntry NewEntry(zero(K)); + NewEntry.VarIndices.push_back(NumCols); + NewEntry.coeffs.push_back(coeff(m)); +@@ -107,12 +108,12 @@ namespace CoCoADortmund + CoCoA_ERROR(ERR::nonstandard, "FGLMBasisConversion: empty Groebner Basis vector"); + + // Check if generated ideal is zero-dimensional +- const ideal I(AsSparsePolyRing(owner(OldGB.front())), OldGB); ++ const ideal I(SparsePolyRing(owner(OldGB.front())), OldGB); + if (!IsZeroDim(I)) + CoCoA_ERROR(ERR::nonstandard, "FGLMBasisConversion: ideal must be 0-dimensional"); + + // Initialization of objects needed for computation +- const SparsePolyRing Kx = AsSparsePolyRing(owner(OldGB.front())); ++ const SparsePolyRing Kx = SparsePolyRing(owner(OldGB.front())); + const ring K = CoeffRing(Kx); + const PPMonoid PPMon = PPM(Kx); + const RingElem FieldOne(one(K)); +--- src/TmpLESystemSolver.C.orig 2014-04-09 07:20:13.000000000 -0600 ++++ src/TmpLESystemSolver.C 2018-06-10 16:59:42.449803650 -0600 +@@ -72,7 +72,7 @@ namespace CoCoADortmund + CoCoA_ERROR(ERR::BadMatrixSize, "mySolve: NumCols(b) > 1."); + + // Field check; should we also check if BaseRing(M) = BaseRing(b) = BaseRing(x0)? +- ring K(BaseRing(M)); ++ ring K(RingOf(M)); + if (!IsField(K)) + CoCoA_ERROR(ERR::NotField, "mySolve: Gauss' algorithm over non-fields not yet implemented."); + diff --git a/giac.spec b/giac.spec index 6952ea4..1eb982b 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.4.9%{subversion} -Release: 2%{?dist} +Release: 3%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -20,18 +20,23 @@ Source1: %{name}-makesrc.sh Source2: xcas.appdata.xml # Recent math.h adds an iszero macro, but giac has an iszero function Patch0: %{name}-iszero.patch +# Adapt to versions of CoCoA > 9950 +Patch1: %{name}-cocoa.patch BuildRequires: readline-devel BuildRequires: gettext-devel BuildRequires: gcc-c++ -BuildRequires: mpfr-devel +BuildRequires: cocoalib-devel +BuildRequires: glpk-devel BuildRequires: gmp-devel BuildRequires: gsl-devel +BuildRequires: mpfr-devel BuildRequires: ntl-devel BuildRequires: pari-devel BuildRequires: lapack-devel BuildRequires: mpfi-devel BuildRequires: mesa-libGL-devel +BuildRequires: libao-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel BuildRequires: fltk-devel @@ -40,9 +45,6 @@ BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: tex(latex), texinfo, texinfo-tex -Requires(post): info -Requires(preun): info - Provides: bundled(tinymt32) %global majver %(cut -d. -f1-3 <<< %{version}) @@ -122,6 +124,7 @@ with Giac computations. %prep %setup -q -n %{name}-%{majver} %patch0 +%patch1 # Remove local intl (already bundled in fedora) rm -rf intl/*.h @@ -273,18 +276,7 @@ find %{buildroot}%{_datadir}/giac/doc -maxdepth 2 -type l| \ grep -v -E "%{_datadir}/giac/doc/aide_cas$" | \ sed -e "s:%{buildroot}::" >>giacdoclist -%post -%{?ldconfig} -/sbin/install-info %{_infodir}/%{name}_us.info %{_infodir}/dir || : -/sbin/install-info %{_infodir}/%{name}_es.info %{_infodir}/dir || : - -%ldconfig_postun - -%preun -if [ $1 = 0 ] ; then -/sbin/install-info --delete %{_infodir}/%{name}_us.info %{_infodir}/dir || : -/sbin/install-info --delete %{_infodir}/%{name}_es.info %{_infodir}/dir || : -fi +%ldconfig_scriptlets %if %{with check} %check @@ -391,6 +383,10 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 5d3ae4f0d9523be00e7f777c0a0207fe5c09ea0e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 4 Jul 2018 11:21:32 -0600 Subject: [PATCH 003/104] More CoCoA adaptations for cocoalib 0.99564. --- giac-cocoa.patch | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/giac-cocoa.patch b/giac-cocoa.patch index 960ebb3..c8b580b 100644 --- a/giac-cocoa.patch +++ b/giac-cocoa.patch @@ -10,28 +10,44 @@ else --- src/cocoa.cc.orig 2017-12-15 01:30:15.000000000 -0700 -+++ src/cocoa.cc 2018-06-10 15:22:44.382283320 -0600 -@@ -25,7 +25,8 @@ ++++ src/cocoa.cc 2018-07-04 07:33:24.545947035 -0600 +@@ -23,9 +23,12 @@ + #endif + #include #include ++#include ++#include #include #include -#include -+#include ++#include +#include #include #include "TmpFGLM.H" #endif +@@ -115,7 +118,7 @@ namespace giac { + return CoCoA::BigInt(g.val); + case _ZINT: + #ifdef COCOA9950 +- return CoCoA::BigInt(*g._ZINTptr); ++ return CoCoA::BigIntFromMPZ(*g._ZINTptr); + #else + return CoCoA::BigInt(CoCoA::CopyFromMPZ,*g._ZINTptr); + #endif --- src/TmpFGLM.C.orig 2014-04-09 07:24:39.000000000 -0600 -+++ src/TmpFGLM.C 2018-06-10 18:39:12.490590550 -0600 -@@ -32,6 +32,7 @@ ++++ src/TmpFGLM.C 2018-07-04 11:06:20.556657555 -0600 +@@ -31,7 +31,10 @@ + #include "CoCoA/QBGenerator.H" #include "CoCoA/RingDistrMPolyInlPP.H" #include "CoCoA/RingHom.H" ++#include "CoCoA/SparsePolyIter.H" #include "CoCoA/SparsePolyRing.H" +#include "CoCoA/SparsePolyOps-ideal.H" ++#include "CoCoA/SparsePolyOps-RingElem.H" // #include using std::size_t; -@@ -81,7 +82,7 @@ namespace CoCoADortmund +@@ -81,7 +84,7 @@ namespace CoCoADortmund // ToDo: Avoid this tedious if-else block if (entry == MatrixMap.end()) { @@ -40,7 +56,7 @@ struct MatrixMapEntry NewEntry(zero(K)); NewEntry.VarIndices.push_back(NumCols); NewEntry.coeffs.push_back(coeff(m)); -@@ -107,12 +108,12 @@ namespace CoCoADortmund +@@ -107,12 +110,12 @@ namespace CoCoADortmund CoCoA_ERROR(ERR::nonstandard, "FGLMBasisConversion: empty Groebner Basis vector"); // Check if generated ideal is zero-dimensional From e1fdb66d65fd3ab6b428b1292b73b52f780e4246 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:19:33 +0000 Subject: [PATCH 004/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 1eb982b..28ccea6 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.4.9%{subversion} -Release: 3%{?dist} +Release: 4%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -383,6 +383,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 062a74455eae47fa88db4b678f2ef1cda47cfead Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 10 Aug 2018 20:04:28 -0600 Subject: [PATCH 005/104] Rebuild for CoCoAlib 0.99600, ntl 11.2.1, and pari 2.11.0. --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 28ccea6..20f0e52 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.4.9%{subversion} -Release: 4%{?dist} +Release: 5%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -383,6 +383,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 790c8413f3c7916ba896a47562dcae2dc9a4b751 Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 11 Oct 2018 14:42:43 +0200 Subject: [PATCH 006/104] Update to 1.5.0 sub-3 --- .gitignore | 1 + giac-makesrc.sh | 4 ++-- giac.spec | 14 +++++++------- sources | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index bbc9e0c..ec64086 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /giac-1.4.9.43.tar.gz /giac-1.4.9.45.tar.gz /giac-1.4.9.59.tar.gz +/giac-1.5.0.3.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 27be556..1156307 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -4,8 +4,8 @@ # package maintainer. # -VERSION="1.4.9" -VERSIONREV="59" +VERSION="1.5.0" +VERSIONREV="3" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index 20f0e52..3b72229 100644 --- a/giac.spec +++ b/giac.spec @@ -2,12 +2,12 @@ # See http://pcm1.e.ujf-grenoble.fr/forum/viewtopic.php?f=19&t=1733&sid=3257f5085f4ae208dc36665f2873252f %bcond_with check -%global subversion .59 +%global subversion .3 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry -Version: 1.4.9%{subversion} -Release: 5%{?dist} +Version: 1.5.0%{subversion} +Release: 1%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -122,9 +122,7 @@ The pgiac command is a perl script to mix Latex documents with Giac computations. %prep -%setup -q -n %{name}-%{majver} -%patch0 -%patch1 +%autosetup -p0 -n %{name}-%{majver} # Remove local intl (already bundled in fedora) rm -rf intl/*.h @@ -159,7 +157,6 @@ rm -f examples/Exemples/demo/._* rm -f examples/Exemples/analyse/._* %build -export LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %configure --enable-static=no --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 \ @@ -383,6 +380,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 diff --git a/sources b/sources index 14ffff4..19a4ee4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.4.9.59.tar.gz) = 027610f0aea165bef945166508a7e6325cbedcac21809ca315be99d95541f88efe77749f62c4512cd714a8ace9368e99b43795a30cf4fd267b4be370c56adb7b +SHA512 (giac-1.5.0.3.tar.gz) = 6fb35547e1eb544ddafc73ae76af6015bec93a16ba60a79da69bac12db0f2dfc2f910e94ece0d811cddbcf2af64198b83fe1121fd95bbcaaf9198b424dd44c77 From 3d7a5a73a82bd7a81dbbd30b628891501512b4a0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 13 Oct 2018 13:45:14 -0600 Subject: [PATCH 007/104] Rebuild for ntl 11.3.0. --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 3b72229..4371a86 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 1%{?dist} +Release: 2%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -380,6 +380,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 37cc527cc7b03a567e91dd284f19d01b3603b2d6 Mon Sep 17 00:00:00 2001 From: sagitter Date: Mon, 14 Jan 2019 13:04:44 +0100 Subject: [PATCH 008/104] Update to 1.5.0 sub-35 --- .gitignore | 1 + giac-makesrc.sh | 2 +- giac.spec | 8 ++++++-- sources | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ec64086..a8cf664 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /giac-1.4.9.45.tar.gz /giac-1.4.9.59.tar.gz /giac-1.5.0.3.tar.gz +/giac-1.5.0.35.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 1156307..7d002d8 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.5.0" -VERSIONREV="3" +VERSIONREV="35" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index 4371a86..cf1d631 100644 --- a/giac.spec +++ b/giac.spec @@ -2,12 +2,12 @@ # See http://pcm1.e.ujf-grenoble.fr/forum/viewtopic.php?f=19&t=1733&sid=3257f5085f4ae208dc36665f2873252f %bcond_with check -%global subversion .3 +%global subversion .35 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 2%{?dist} +Release: 1%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -286,6 +286,7 @@ make -C check check %license LICENSE.tinymt32 %{_bindir}/icas %{_bindir}/giac +%{_bindir}/hevea2mml %{_bindir}/*_help %{_libdir}/libgiac.so.* # The following files are required at runtime by icas AND xcas. @@ -380,6 +381,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 diff --git a/sources b/sources index 19a4ee4..4544fb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.5.0.3.tar.gz) = 6fb35547e1eb544ddafc73ae76af6015bec93a16ba60a79da69bac12db0f2dfc2f910e94ece0d811cddbcf2af64198b83fe1121fd95bbcaaf9198b424dd44c77 +SHA512 (giac-1.5.0.35.tar.gz) = 8762595c253316ae32670356a4fe90608cd671e6be625060e8044d49764742e52d2a4c2fa20a38e0e876d5e45851dab6e5c67596c54765604a195d8160290401 From 0ade5c61319c4ce0e62d1d3e7b6dba58ec71bc54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 22:19:22 +0000 Subject: [PATCH 009/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 cf1d631..5eeb6bf 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 1%{?dist} +Release: 2%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -381,6 +381,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 92324af58c4a4b85e44e8161131636f642434a9f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 17 Feb 2019 09:30:50 +0100 Subject: [PATCH 010/104] Rebuild for readline 8.0 --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 5eeb6bf..472b53d 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 2%{?dist} +Release: 3%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -381,6 +381,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From bc72a831d48c7f9ed221e4978da2680018057c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 24 Apr 2019 14:56:32 +0200 Subject: [PATCH 011/104] Remove hardcoded gzip suffix from GNU info pages --- giac.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/giac.spec b/giac.spec index 472b53d..3348123 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 3%{?dist} +Release: 4%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -308,7 +308,7 @@ make -C check check %dir %{_datadir}/giac/doc/pt %dir %{_datadir}/giac/doc/zh # -%{_infodir}/giac_*.info.gz +%{_infodir}/giac_*.info.* %{_mandir}/man1/giac* %{_mandir}/man1/*_help* @@ -381,6 +381,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 73a256f3b7fbe70f5113693b547ec0786971c258 Mon Sep 17 00:00:00 2001 From: sagitter Date: Sat, 18 May 2019 14:49:57 +0200 Subject: [PATCH 012/104] Update to 1.5.0 sub-53 rhbz#1711374 --- .gitignore | 1 + giac-makesrc.sh | 2 +- giac.spec | 7 +++++-- sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a8cf664..1ee0a05 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /giac-1.4.9.59.tar.gz /giac-1.5.0.3.tar.gz /giac-1.5.0.35.tar.gz +/giac-1.5.0.53.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 7d002d8..de5ae75 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.5.0" -VERSIONREV="35" +VERSIONREV="53" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index 3348123..59f6bce 100644 --- a/giac.spec +++ b/giac.spec @@ -2,12 +2,12 @@ # See http://pcm1.e.ujf-grenoble.fr/forum/viewtopic.php?f=19&t=1733&sid=3257f5085f4ae208dc36665f2873252f %bcond_with check -%global subversion .35 +%global subversion .53 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 4%{?dist} +Release: 1%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -381,6 +381,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 diff --git a/sources b/sources index 4544fb2..974b6a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.5.0.35.tar.gz) = 8762595c253316ae32670356a4fe90608cd671e6be625060e8044d49764742e52d2a4c2fa20a38e0e876d5e45851dab6e5c67596c54765604a195d8160290401 +SHA512 (giac-1.5.0.53.tar.gz) = 10c3d61f493bfda0066a1d4e976e1c8d630b48ec69b5a5ec5141a23fbe37560948cbfdd64bc9aee6ad1a6706fa11b9d7cc8510690dd633be30d5aed4c056a6e2 From e16869487e4b73a9cfe7a8d4a3cdacb04393d445 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 03:19:35 +0000 Subject: [PATCH 013/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 59f6bce..c9da593 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 1%{?dist} +Release: 2%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -381,6 +381,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 047f778a34b68b264b474ae99816043197a7c6e6 Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Tue, 20 Aug 2019 22:03:55 +0200 Subject: [PATCH 014/104] Rebuilt for GSL 2.6. --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index c9da593..233d016 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 2%{?dist} +Release: 3%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -381,6 +381,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From ec17fa23953a420936b5c58a44adfc776af867a4 Mon Sep 17 00:00:00 2001 From: sagitter Date: Sat, 14 Sep 2019 19:14:10 +0200 Subject: [PATCH 015/104] Update to 1.5.0 sub-63 --- .gitignore | 1 + giac-makesrc.sh | 2 +- giac.spec | 7 +++++-- sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1ee0a05..4055f2c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /giac-1.5.0.3.tar.gz /giac-1.5.0.35.tar.gz /giac-1.5.0.53.tar.gz +/giac-1.5.0.63.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index de5ae75..accfb06 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.5.0" -VERSIONREV="53" +VERSIONREV="63" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index 233d016..4d18b28 100644 --- a/giac.spec +++ b/giac.spec @@ -2,12 +2,12 @@ # See http://pcm1.e.ujf-grenoble.fr/forum/viewtopic.php?f=19&t=1733&sid=3257f5085f4ae208dc36665f2873252f %bcond_with check -%global subversion .53 +%global subversion .63 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 3%{?dist} +Release: 1%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -381,6 +381,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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. diff --git a/sources b/sources index 974b6a3..62f9be6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.5.0.53.tar.gz) = 10c3d61f493bfda0066a1d4e976e1c8d630b48ec69b5a5ec5141a23fbe37560948cbfdd64bc9aee6ad1a6706fa11b9d7cc8510690dd633be30d5aed4c056a6e2 +SHA512 (giac-1.5.0.63.tar.gz) = 607df09be8182988bbd48d9912014605b34a085b97c50b36eb4821f6807c34afd1c0e25043292841a1dcc2ca6c1d3c396200ef6794ddc761238049a077af7f94 From 2d716ed27048d67a0288154e60048ccb6c8a973d Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 24 Sep 2019 16:10:22 -0600 Subject: [PATCH 016/104] Rebuild for ntl 11.3.4. --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 4d18b28..6c01e6e 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 1%{?dist} +Release: 2%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -381,6 +381,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From b7724a4a5dd357d48c850533aa5d6ac17c3c07ff Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 11 Oct 2019 08:44:11 -0600 Subject: [PATCH 017/104] Rebuild for mpfr 4. --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 6c01e6e..d148fa7 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 2%{?dist} +Release: 3%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -381,6 +381,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 266afef6abfe1042ee1467176e241e7873d67a76 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 27 Nov 2019 12:34:52 -0700 Subject: [PATCH 018/104] Rebuild for CoCoAlib 0.99650. --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index d148fa7..eb2517b 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 3%{?dist} +Release: 4%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -381,6 +381,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From b6144207f7255812fb54688c476fda0110ab2f12 Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 28 Nov 2019 19:49:48 +0100 Subject: [PATCH 019/104] Update to 1.5.0 sub-75|Drop cocoalib patch --- .gitignore | 1 + giac-cocoa.patch | 84 ------------------------------------------------ giac-makesrc.sh | 2 +- giac.spec | 10 ++++-- sources | 2 +- 5 files changed, 10 insertions(+), 89 deletions(-) delete mode 100644 giac-cocoa.patch diff --git a/.gitignore b/.gitignore index 4055f2c..00f66b0 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /giac-1.5.0.35.tar.gz /giac-1.5.0.53.tar.gz /giac-1.5.0.63.tar.gz +/giac-1.5.0.75.tar.gz diff --git a/giac-cocoa.patch b/giac-cocoa.patch deleted file mode 100644 index c8b580b..0000000 --- a/giac-cocoa.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- configure.orig 2017-11-21 23:57:49.000000000 -0700 -+++ configure 2018-06-10 15:03:48.540821997 -0600 -@@ -16249,7 +16249,7 @@ fi - - - if test "$CONFIG_COCOA" = "yes"; then -- ac_fn_cxx_check_header_mongrel "$LINENO" "CoCoA/io.H" "ac_cv_header_CoCoA_io_H" "$ac_includes_default" -+ ac_fn_cxx_check_header_mongrel "$LINENO" "CoCoA/ring.H" "ac_cv_header_CoCoA_io_H" "$ac_includes_default" - if test "x$ac_cv_header_CoCoA_io_H" = xyes; then : - - else ---- src/cocoa.cc.orig 2017-12-15 01:30:15.000000000 -0700 -+++ src/cocoa.cc 2018-07-04 07:33:24.545947035 -0600 -@@ -23,9 +23,12 @@ - #endif - #include - #include -+#include -+#include - #include - #include --#include -+#include -+#include - #include - #include "TmpFGLM.H" - #endif -@@ -115,7 +118,7 @@ namespace giac { - return CoCoA::BigInt(g.val); - case _ZINT: - #ifdef COCOA9950 -- return CoCoA::BigInt(*g._ZINTptr); -+ return CoCoA::BigIntFromMPZ(*g._ZINTptr); - #else - return CoCoA::BigInt(CoCoA::CopyFromMPZ,*g._ZINTptr); - #endif ---- src/TmpFGLM.C.orig 2014-04-09 07:24:39.000000000 -0600 -+++ src/TmpFGLM.C 2018-07-04 11:06:20.556657555 -0600 -@@ -31,7 +31,10 @@ - #include "CoCoA/QBGenerator.H" - #include "CoCoA/RingDistrMPolyInlPP.H" - #include "CoCoA/RingHom.H" -+#include "CoCoA/SparsePolyIter.H" - #include "CoCoA/SparsePolyRing.H" -+#include "CoCoA/SparsePolyOps-ideal.H" -+#include "CoCoA/SparsePolyOps-RingElem.H" - - // #include - using std::size_t; -@@ -81,7 +84,7 @@ namespace CoCoADortmund - // ToDo: Avoid this tedious if-else block - if (entry == MatrixMap.end()) - { -- ring K = CoeffRing(AsSparsePolyRing(owner(p))); -+ ring K = CoeffRing(SparsePolyRing(owner(p))); - struct MatrixMapEntry NewEntry(zero(K)); - NewEntry.VarIndices.push_back(NumCols); - NewEntry.coeffs.push_back(coeff(m)); -@@ -107,12 +110,12 @@ namespace CoCoADortmund - CoCoA_ERROR(ERR::nonstandard, "FGLMBasisConversion: empty Groebner Basis vector"); - - // Check if generated ideal is zero-dimensional -- const ideal I(AsSparsePolyRing(owner(OldGB.front())), OldGB); -+ const ideal I(SparsePolyRing(owner(OldGB.front())), OldGB); - if (!IsZeroDim(I)) - CoCoA_ERROR(ERR::nonstandard, "FGLMBasisConversion: ideal must be 0-dimensional"); - - // Initialization of objects needed for computation -- const SparsePolyRing Kx = AsSparsePolyRing(owner(OldGB.front())); -+ const SparsePolyRing Kx = SparsePolyRing(owner(OldGB.front())); - const ring K = CoeffRing(Kx); - const PPMonoid PPMon = PPM(Kx); - const RingElem FieldOne(one(K)); ---- src/TmpLESystemSolver.C.orig 2014-04-09 07:20:13.000000000 -0600 -+++ src/TmpLESystemSolver.C 2018-06-10 16:59:42.449803650 -0600 -@@ -72,7 +72,7 @@ namespace CoCoADortmund - CoCoA_ERROR(ERR::BadMatrixSize, "mySolve: NumCols(b) > 1."); - - // Field check; should we also check if BaseRing(M) = BaseRing(b) = BaseRing(x0)? -- ring K(BaseRing(M)); -+ ring K(RingOf(M)); - if (!IsField(K)) - CoCoA_ERROR(ERR::NotField, "mySolve: Gauss' algorithm over non-fields not yet implemented."); - diff --git a/giac-makesrc.sh b/giac-makesrc.sh index accfb06..1e6818f 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.5.0" -VERSIONREV="63" +VERSIONREV="75" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index eb2517b..37b84cf 100644 --- a/giac.spec +++ b/giac.spec @@ -2,12 +2,12 @@ # See http://pcm1.e.ujf-grenoble.fr/forum/viewtopic.php?f=19&t=1733&sid=3257f5085f4ae208dc36665f2873252f %bcond_with check -%global subversion .63 +%global subversion .75 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 4%{?dist} +Release: 1%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -21,7 +21,7 @@ Source2: xcas.appdata.xml # Recent math.h adds an iszero macro, but giac has an iszero function Patch0: %{name}-iszero.patch # Adapt to versions of CoCoA > 9950 -Patch1: %{name}-cocoa.patch +#Patch1: %%{name}-cocoa.patch BuildRequires: readline-devel BuildRequires: gettext-devel @@ -381,6 +381,10 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 diff --git a/sources b/sources index 62f9be6..1656e65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.5.0.63.tar.gz) = 607df09be8182988bbd48d9912014605b34a085b97c50b36eb4821f6807c34afd1c0e25043292841a1dcc2ca6c1d3c396200ef6794ddc761238049a077af7f94 +SHA512 (giac-1.5.0.75.tar.gz) = 1f5a0a45dcea9d91abb3adff138899c856571539895609ff16591d82449b27bab108ec5b8258697afe4a8e5ec5557cac4c0d3a7dd7618bf68298efffff115736 From 316adc45302280edfdc6b1471a4083889154942d Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 28 Nov 2019 19:53:01 +0100 Subject: [PATCH 020/104] Remove line commented --- giac.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/giac.spec b/giac.spec index 37b84cf..1a244fa 100644 --- a/giac.spec +++ b/giac.spec @@ -18,10 +18,9 @@ URL: http://www-fourier.ujf-grenoble.fr/~parisse/giac.html Source0: %{name}-%{version}.tar.gz Source1: %{name}-makesrc.sh Source2: xcas.appdata.xml + # Recent math.h adds an iszero macro, but giac has an iszero function Patch0: %{name}-iszero.patch -# Adapt to versions of CoCoA > 9950 -#Patch1: %%{name}-cocoa.patch BuildRequires: readline-devel BuildRequires: gettext-devel From 120b2e2737f3435b5ec41c5deed1f6fca7b94aa2 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 7 Dec 2019 08:32:00 -0700 Subject: [PATCH 021/104] Rebuild for CoCoAlib 0.99650 again. --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 1a244fa..4fea00d 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 1%{?dist} +Release: 2%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -380,6 +380,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 50d4c23edc2247650d4ff8e057e60bd75477fbe4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 9 Jan 2020 19:04:34 -0700 Subject: [PATCH 022/104] Rebuild for ntl 11.4.3. --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 4fea00d..c66abc8 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 2%{?dist} +Release: 3%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -380,6 +380,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* Thu Jan 9 2019 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 From 93139aa36ff55cb923677b92202bd8a249bc0ae7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 9 Jan 2020 19:14:23 -0700 Subject: [PATCH 023/104] Welcome to 2020. --- giac.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index c66abc8..fd2cf2f 100644 --- a/giac.spec +++ b/giac.spec @@ -380,7 +380,7 @@ make -C check check %{_datadir}/giac/examples/ %changelog -* Thu Jan 9 2019 Jerry James - 1.5.0.75-3 +* 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 From 90ecdc09e91ef48e02a9de9d44520d73035cb875 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 21:49:08 +0000 Subject: [PATCH 024/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 fd2cf2f..a4034a4 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 3%{?dist} +Release: 4%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -380,6 +380,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From a68c51d8a7edb18dda5948606c4d77c144c61698 Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 4 Feb 2020 18:26:08 +0100 Subject: [PATCH 025/104] Update to 1.5.0 sub-85 --- .gitignore | 1 + giac-makesrc.sh | 2 +- giac.spec | 7 +++++-- sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 00f66b0..60dd112 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /giac-1.5.0.53.tar.gz /giac-1.5.0.63.tar.gz /giac-1.5.0.75.tar.gz +/giac-1.5.0.85.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 1e6818f..8f3a473 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.5.0" -VERSIONREV="75" +VERSIONREV="85" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index a4034a4..1707b80 100644 --- a/giac.spec +++ b/giac.spec @@ -2,12 +2,12 @@ # See http://pcm1.e.ujf-grenoble.fr/forum/viewtopic.php?f=19&t=1733&sid=3257f5085f4ae208dc36665f2873252f %bcond_with check -%global subversion .75 +%global subversion .85 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 4%{?dist} +Release: 1%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -380,6 +380,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 diff --git a/sources b/sources index 1656e65..624f64a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.5.0.75.tar.gz) = 1f5a0a45dcea9d91abb3adff138899c856571539895609ff16591d82449b27bab108ec5b8258697afe4a8e5ec5557cac4c0d3a7dd7618bf68298efffff115736 +SHA512 (giac-1.5.0.85.tar.gz) = 18782747b56e04840ae53e2aa021cc3d92ca07c3573b498f5138e3825ab7193c662ee70890af92932e8a5f538268840c441cb8608381e9a11f984f927bbccf18 From c197b9f3a9cff4d33f5ae32776ecc2b53b48f186 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 20 Mar 2020 11:40:24 -0600 Subject: [PATCH 026/104] Rebuild for CoCoAlib 0.99700. Add cocoalib patch. Build with gmp-ecm, libcurl, libsamplerate, and nauty support. --- giac-cocoalib.patch | 123 ++++++++++++++++++++++++++++++++++++++++++++ giac.spec | 14 ++++- 2 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 giac-cocoalib.patch diff --git a/giac-cocoalib.patch b/giac-cocoalib.patch new file mode 100644 index 0000000..e2f37ad --- /dev/null +++ b/giac-cocoalib.patch @@ -0,0 +1,123 @@ +--- configure.in.orig 2018-12-03 02:01:53.000000000 -0700 ++++ configure.in 2020-03-20 08:52:36.439222107 -0600 +@@ -249,7 +249,7 @@ AC_ARG_ENABLE([cocoa], + [if test "$enableval" = "no"; then CONFIG_COCOA="no"; fi], []) + + if test "$CONFIG_COCOA" = "yes"; then +- AC_CHECK_HEADER(CoCoA/io.H, [], [CONFIG_COCOA="no"]) ++ AC_CHECK_HEADER(CoCoA/BigInt.H, [], [CONFIG_COCOA="no"]) + fi + if test "$CONFIG_COCOA" = "yes"; then + save_LIBS="$LIBS" +--- configure.orig 2018-12-03 02:05:57.000000000 -0700 ++++ configure 2020-03-20 08:54:03.561091098 -0600 +@@ -16356,8 +16356,8 @@ fi + + + if test "$CONFIG_COCOA" = "yes"; then +- ac_fn_cxx_check_header_mongrel "$LINENO" "CoCoA/io.H" "ac_cv_header_CoCoA_io_H" "$ac_includes_default" +-if test "x$ac_cv_header_CoCoA_io_H" = xyes; then : ++ ac_fn_cxx_check_header_mongrel "$LINENO" "CoCoA/BigInt.H" "ac_cv_header_CoCoA_BigInt_H" "$ac_includes_default" ++if test "x$ac_cv_header_CoCoA_BigInt_H" = xyes; then : + + else + CONFIG_COCOA="no" +--- src/TmpLESystemSolver.C.orig 2019-11-03 11:20:03.000000000 -0700 ++++ src/TmpLESystemSolver.C 2020-03-20 11:01:06.088180089 -0600 +@@ -29,6 +29,7 @@ + #include "CoCoA/matrix.H" + #include "CoCoA/ring.H" + #include "CoCoA/error.H" ++#include "CoCoA/MachineInt.H" + + // #include // Included by DenseMatrix.H + using std::vector; +@@ -50,7 +51,11 @@ namespace CoCoADortmund + + for (size_t row = 0; row < NumRowsMSource; ++row) + for (size_t col = 0; col < NumColsMSource; ++col) +- SetEntry(MTarget, row, col, MSource(row, col)); ++ { ++ const MachineInt rowInt(static_cast(row)); ++ const MachineInt colInt(static_cast(col)); ++ SetEntry(MTarget, row, col, MSource(rowInt, colInt)); ++ } + } + + // Solve the linear system M*x = b by using Gauss' algorithm +@@ -60,6 +65,7 @@ namespace CoCoADortmund + const size_t NumColsM = NumCols(M); + const size_t NumRowsb = NumRows(b); + const size_t NumColsb = NumCols(b); ++ const MachineInt zInt(0); + + // Dimension check + if (NumRowsM != NumRowsb) +@@ -91,13 +97,17 @@ namespace CoCoADortmund + size_t row = 0; + for (size_t col = 0; col < NumColsM && row < NumRowsM; ++col) + { ++ const MachineInt rowInt(static_cast(row)); ++ const MachineInt colInt(static_cast(col)); ++ + // Check if current column contains an element != 0 +- if (IsZero(MCopy(row, col))) ++ if (IsZero(MCopy(rowInt, colInt))) + { + size_t i = row+1; + for ( ; i < NumRowsM; ++i) + { +- if (!IsZero(MCopy(i, col))) ++ const MachineInt iInt(static_cast(i)); ++ if (!IsZero(MCopy(iInt, colInt))) + { + // Switch MCopy and bCopy rows + MCopy->mySwapRows(i, row); +@@ -113,13 +123,14 @@ namespace CoCoADortmund + positions.push_back(make_pair(row, col)); + + // Found an element != 0 in current column; apply elemination +- c = MCopy(row, col); ++ c = MCopy(rowInt, colInt); + + for (size_t i = row+1; i < NumRowsM; ++i) + { + // Transform MCopy and bCopy +- bCopy->myAddRowMul(i, row, -MCopy(i, col)/c); +- MCopy->myAddRowMul(i, row, -MCopy(i, col)/c); ++ const MachineInt iInt(static_cast(i)); ++ bCopy->myAddRowMul(i, row, -MCopy(iInt, colInt)/c); ++ MCopy->myAddRowMul(i, row, -MCopy(iInt, colInt)/c); + } + + ++row; +@@ -128,7 +139,8 @@ namespace CoCoADortmund + // row = rank(MCopy); check if a solution for the equation system exists + for (size_t i = row; i < NumRowsb; ++i) + { +- if (!IsZero(bCopy(i, 0))) ++ const MachineInt iInt(static_cast(i)); ++ if (!IsZero(bCopy(iInt, zInt))) + return false; + } + +@@ -138,13 +150,16 @@ namespace CoCoADortmund + while (!positions.empty()) + { + const size_t i = positions.back().first, j = positions.back().second; ++ const MachineInt iInt(static_cast(i)); ++ const MachineInt jInt(static_cast(j)); + +- RingElem x(bCopy(i, 0)); ++ RingElem x(bCopy(iInt, zInt)); + for (size_t k = j + 1; k < NumColsM; ++k) + { +- x -= MCopy(i, k) * x0Tmp(k, 0); ++ const MachineInt kInt(static_cast(k)); ++ x -= MCopy(iInt, kInt) * x0Tmp(kInt, zInt); + } +- SetEntry(x0Tmp, j, 0, x/MCopy(i, j)); ++ SetEntry(x0Tmp, j, 0, x/MCopy(iInt, jInt)); + + positions.pop_back(); + } diff --git a/giac.spec b/giac.spec index 1707b80..ecf3ce6 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 1%{?dist} +Release: 2%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -22,13 +22,18 @@ Source2: xcas.appdata.xml # Recent math.h adds an iszero macro, but giac has an iszero function Patch0: %{name}-iszero.patch +# Adapt to cocoalib 0.99700 +Patch1: %{name}-cocoalib.patch + BuildRequires: readline-devel BuildRequires: gettext-devel BuildRequires: gcc-c++ BuildRequires: cocoalib-devel BuildRequires: glpk-devel BuildRequires: gmp-devel +BuildRequires: gmp-ecm-devel BuildRequires: gsl-devel +BuildRequires: libnauty-devel BuildRequires: mpfr-devel BuildRequires: ntl-devel BuildRequires: pari-devel @@ -36,8 +41,10 @@ BuildRequires: lapack-devel BuildRequires: mpfi-devel BuildRequires: mesa-libGL-devel BuildRequires: libao-devel +BuildRequires: libcurl-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel +BuildRequires: libsamplerate-devel BuildRequires: fltk-devel BuildRequires: libXinerama-devel BuildRequires: desktop-file-utils @@ -380,6 +387,11 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 1b27315c79198b541da5e11b1933c9a0b8b08507 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 2 Jun 2020 10:25:26 -0600 Subject: [PATCH 027/104] Rebuild for nauty 2.7.1. --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index ecf3ce6..8122691 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 2%{?dist} +Release: 3%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -387,6 +387,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 3aed5bdd310e13e64e1428d137531b01a7ddc060 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 30 Jun 2020 13:17:24 -0600 Subject: [PATCH 028/104] - Fix broken configure test compromised by LTO --- giac-config.patch | 19 +++++++++++++++++++ giac.spec | 8 +++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 giac-config.patch diff --git a/giac-config.patch b/giac-config.patch new file mode 100644 index 0000000..c7c4658 --- /dev/null +++ b/giac-config.patch @@ -0,0 +1,19 @@ +diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4 +index b8d7817..23fdc1d 100644 +--- m4/intdiv0.m4 ++++ m4/intdiv0.m4 +@@ -29,10 +29,10 @@ sigfpe_handler (sig) int sig; + exit (sig != SIGFPE); + } + +-int x = 1; +-int y = 0; +-int z; +-int nan; ++volatile int x = 1; ++volatile int y = 0; ++volatile int z; ++volatile int nan; + + int main () + { diff --git a/giac.spec b/giac.spec index 8122691..000890c 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.5.0%{subversion} -Release: 3%{?dist} +Release: 4%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -25,6 +25,9 @@ Patch0: %{name}-iszero.patch # Adapt to cocoalib 0.99700 Patch1: %{name}-cocoalib.patch +# Deal with LTO compromised configure test +Patch2: %{name}-config.patch + BuildRequires: readline-devel BuildRequires: gettext-devel BuildRequires: gcc-c++ @@ -387,6 +390,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From ff0e8e0b6859597411ad29d9005bc35708c03d42 Mon Sep 17 00:00:00 2001 From: sagitter Date: Sun, 19 Jul 2020 20:42:59 +0200 Subject: [PATCH 029/104] Update to 1.6.0 sub-7 --- .gitignore | 1 + giac-makesrc.sh | 4 ++-- giac.spec | 9 ++++++--- sources | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 60dd112..c1156da 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /giac-1.5.0.63.tar.gz /giac-1.5.0.75.tar.gz /giac-1.5.0.85.tar.gz +/giac-1.6.0.7.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 8f3a473..9e37dc7 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -4,8 +4,8 @@ # package maintainer. # -VERSION="1.5.0" -VERSIONREV="85" +VERSION="1.6.0" +VERSIONREV="7" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index 000890c..f22f601 100644 --- a/giac.spec +++ b/giac.spec @@ -2,12 +2,12 @@ # See http://pcm1.e.ujf-grenoble.fr/forum/viewtopic.php?f=19&t=1733&sid=3257f5085f4ae208dc36665f2873252f %bcond_with check -%global subversion .85 +%global subversion .7 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry -Version: 1.5.0%{subversion} -Release: 4%{?dist} +Version: 1.6.0%{subversion} +Release: 1%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -390,6 +390,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 diff --git a/sources b/sources index 624f64a..1361492 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.5.0.85.tar.gz) = 18782747b56e04840ae53e2aa021cc3d92ca07c3573b498f5138e3825ab7193c662ee70890af92932e8a5f538268840c441cb8608381e9a11f984f927bbccf18 +SHA512 (giac-1.6.0.7.tar.gz) = 20757c8ac6555f367823400fbf948b117cf27ffa40e48084c89eaba24fbafe716732a28e1310e5d3e26fae1448b2398e50c36a11b89c3a89980e0eed1baba9b5 From 9954ee0e5772eb71ce2534a9b19419820e5ba4a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 19:57:50 +0000 Subject: [PATCH 030/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 f22f601..d86a18a 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.6.0%{subversion} -Release: 1%{?dist} +Release: 2%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -390,6 +390,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From a099127b7ca51424bd127f5193ff9d80e48019c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:47:19 +0000 Subject: [PATCH 031/104] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- giac.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index d86a18a..56d1b88 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.6.0%{subversion} -Release: 2%{?dist} +Release: 3%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -390,6 +390,10 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 2b2db2f9e3ada2e15087d2430d4f3a555d21a956 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 18 Aug 2020 19:31:03 -0600 Subject: [PATCH 032/104] Force C++14 as this code is not C++17 ready --- giac.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 56d1b88..2b02ecc 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.6.0%{subversion} -Release: 3%{?dist} +Release: 4%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -166,6 +166,8 @@ rm -f examples/Exemples/demo/._* rm -f examples/Exemples/analyse/._* %build +export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" + %configure --enable-static=no --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 \ @@ -390,6 +392,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From c96a51e04e0aa449b54286ab56328f05994dd915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Thu, 27 Aug 2020 13:31:04 +0200 Subject: [PATCH 033/104] https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager --- giac.spec | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 2b02ecc..b979c4d 100644 --- a/giac.spec +++ b/giac.spec @@ -2,6 +2,10 @@ # See http://pcm1.e.ujf-grenoble.fr/forum/viewtopic.php?f=19&t=1733&sid=3257f5085f4ae208dc36665f2873252f %bcond_with check +%if 0%{?fedora} >= 33 +%bcond_without flexiblas +%endif + %global subversion .7 Name: giac @@ -40,7 +44,11 @@ BuildRequires: libnauty-devel BuildRequires: mpfr-devel BuildRequires: ntl-devel BuildRequires: pari-devel -BuildRequires: lapack-devel +%if %{with flexiblas} +BuildRequires: flexiblas-devel +%else +BuildRequires: blas-devel, lapack-devel +%endif BuildRequires: mpfi-devel BuildRequires: mesa-libGL-devel BuildRequires: libao-devel @@ -168,6 +176,11 @@ rm -f examples/Exemples/analyse/._* %build export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" +%if %{with flexiblas} +sed -e 's|LIB(blas|LIB(flexiblas|g' -e 's|LIB(lapack|LIB(flexiblas|g' -i configure.in +sed -e 's|-lblas|-lflexiblas|g' -e 's|-llapack|-lflexiblas|g' -i configure +%endif + %configure --enable-static=no --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 \ @@ -392,6 +405,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 5adb72f2c6fc03ee2099a1aa026b588479654bf8 Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 21 Oct 2020 22:23:25 +0200 Subject: [PATCH 034/104] Update to 1.6.0 sub-25| Include libmicropython.a --- .gitignore | 1 + giac-1.6.0-fix_micropy_compiler_flags.patch | 100 ++++++++++++++++ giac-cocoalib.patch | 123 ------------------- giac-makesrc.sh | 2 +- giac.spec | 126 ++++++++++++-------- sources | 2 +- 6 files changed, 180 insertions(+), 174 deletions(-) create mode 100644 giac-1.6.0-fix_micropy_compiler_flags.patch delete mode 100644 giac-cocoalib.patch diff --git a/.gitignore b/.gitignore index c1156da..f7771b0 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /giac-1.5.0.75.tar.gz /giac-1.5.0.85.tar.gz /giac-1.6.0.7.tar.gz +/giac-1.6.0.25.tar.gz diff --git a/giac-1.6.0-fix_micropy_compiler_flags.patch b/giac-1.6.0-fix_micropy_compiler_flags.patch new file mode 100644 index 0000000..b417a6b --- /dev/null +++ b/giac-1.6.0-fix_micropy_compiler_flags.patch @@ -0,0 +1,100 @@ +--- micropython-1.12/ports/unix/Makefile.orig 2020-10-21 13:52:17.066827941 +0200 ++++ micropython-1.12/ports/unix/Makefile 2020-10-21 13:55:01.614107239 +0200 +@@ -27,14 +27,14 @@ + # compiler settings + 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) + + # Debugging/Optimization + ifdef DEBUG + CFLAGS += -g + COPT = -O0 + else +-COPT = -Os -fdata-sections -ffunction-sections -DNDEBUG ++COPT = -fdata-sections -ffunction-sections -DNDEBUG + # _FORTIFY_SOURCE is a feature in gcc/glibc which is intended to provide extra + # security for detecting buffer overflows. Some distros (Ubuntu at the very least) + # have it enabled by default. +--- micropython-1.12/xcas/Makefile.orig 2020-10-21 15:27:04.025499976 +0200 ++++ micropython-1.12/xcas/Makefile 2020-10-21 15:30:30.579300358 +0200 +@@ -32,16 +32,16 @@ + ifdef DEBUG + COPT = -g + else +-COPT = -g #-fomit-frame-pointer -flto ++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) + + + +-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/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 +@@ -31,14 +31,14 @@ + ifdef DEBUG + COPT = -O0 -g + else +-COPT = -Os -g #-fomit-frame-pointer -flto ++COPT = -g #-fomit-frame-pointer -flto + 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) + +-LDFLAGS = $(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 +@@ -31,16 +31,16 @@ + ifdef DEBUG + COPT = -O0 -g + else +-COPT = -Ofast -g #-fomit-frame-pointer -flto ++COPT = -g #-fomit-frame-pointer -flto + 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 += -mthumb -march=armv7e-m -mfloat-abi=hard -mcpu=cortex-m7 -mfpu=fpv5-sp-d16 -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) diff --git a/giac-cocoalib.patch b/giac-cocoalib.patch deleted file mode 100644 index e2f37ad..0000000 --- a/giac-cocoalib.patch +++ /dev/null @@ -1,123 +0,0 @@ ---- configure.in.orig 2018-12-03 02:01:53.000000000 -0700 -+++ configure.in 2020-03-20 08:52:36.439222107 -0600 -@@ -249,7 +249,7 @@ AC_ARG_ENABLE([cocoa], - [if test "$enableval" = "no"; then CONFIG_COCOA="no"; fi], []) - - if test "$CONFIG_COCOA" = "yes"; then -- AC_CHECK_HEADER(CoCoA/io.H, [], [CONFIG_COCOA="no"]) -+ AC_CHECK_HEADER(CoCoA/BigInt.H, [], [CONFIG_COCOA="no"]) - fi - if test "$CONFIG_COCOA" = "yes"; then - save_LIBS="$LIBS" ---- configure.orig 2018-12-03 02:05:57.000000000 -0700 -+++ configure 2020-03-20 08:54:03.561091098 -0600 -@@ -16356,8 +16356,8 @@ fi - - - if test "$CONFIG_COCOA" = "yes"; then -- ac_fn_cxx_check_header_mongrel "$LINENO" "CoCoA/io.H" "ac_cv_header_CoCoA_io_H" "$ac_includes_default" --if test "x$ac_cv_header_CoCoA_io_H" = xyes; then : -+ ac_fn_cxx_check_header_mongrel "$LINENO" "CoCoA/BigInt.H" "ac_cv_header_CoCoA_BigInt_H" "$ac_includes_default" -+if test "x$ac_cv_header_CoCoA_BigInt_H" = xyes; then : - - else - CONFIG_COCOA="no" ---- src/TmpLESystemSolver.C.orig 2019-11-03 11:20:03.000000000 -0700 -+++ src/TmpLESystemSolver.C 2020-03-20 11:01:06.088180089 -0600 -@@ -29,6 +29,7 @@ - #include "CoCoA/matrix.H" - #include "CoCoA/ring.H" - #include "CoCoA/error.H" -+#include "CoCoA/MachineInt.H" - - // #include // Included by DenseMatrix.H - using std::vector; -@@ -50,7 +51,11 @@ namespace CoCoADortmund - - for (size_t row = 0; row < NumRowsMSource; ++row) - for (size_t col = 0; col < NumColsMSource; ++col) -- SetEntry(MTarget, row, col, MSource(row, col)); -+ { -+ const MachineInt rowInt(static_cast(row)); -+ const MachineInt colInt(static_cast(col)); -+ SetEntry(MTarget, row, col, MSource(rowInt, colInt)); -+ } - } - - // Solve the linear system M*x = b by using Gauss' algorithm -@@ -60,6 +65,7 @@ namespace CoCoADortmund - const size_t NumColsM = NumCols(M); - const size_t NumRowsb = NumRows(b); - const size_t NumColsb = NumCols(b); -+ const MachineInt zInt(0); - - // Dimension check - if (NumRowsM != NumRowsb) -@@ -91,13 +97,17 @@ namespace CoCoADortmund - size_t row = 0; - for (size_t col = 0; col < NumColsM && row < NumRowsM; ++col) - { -+ const MachineInt rowInt(static_cast(row)); -+ const MachineInt colInt(static_cast(col)); -+ - // Check if current column contains an element != 0 -- if (IsZero(MCopy(row, col))) -+ if (IsZero(MCopy(rowInt, colInt))) - { - size_t i = row+1; - for ( ; i < NumRowsM; ++i) - { -- if (!IsZero(MCopy(i, col))) -+ const MachineInt iInt(static_cast(i)); -+ if (!IsZero(MCopy(iInt, colInt))) - { - // Switch MCopy and bCopy rows - MCopy->mySwapRows(i, row); -@@ -113,13 +123,14 @@ namespace CoCoADortmund - positions.push_back(make_pair(row, col)); - - // Found an element != 0 in current column; apply elemination -- c = MCopy(row, col); -+ c = MCopy(rowInt, colInt); - - for (size_t i = row+1; i < NumRowsM; ++i) - { - // Transform MCopy and bCopy -- bCopy->myAddRowMul(i, row, -MCopy(i, col)/c); -- MCopy->myAddRowMul(i, row, -MCopy(i, col)/c); -+ const MachineInt iInt(static_cast(i)); -+ bCopy->myAddRowMul(i, row, -MCopy(iInt, colInt)/c); -+ MCopy->myAddRowMul(i, row, -MCopy(iInt, colInt)/c); - } - - ++row; -@@ -128,7 +139,8 @@ namespace CoCoADortmund - // row = rank(MCopy); check if a solution for the equation system exists - for (size_t i = row; i < NumRowsb; ++i) - { -- if (!IsZero(bCopy(i, 0))) -+ const MachineInt iInt(static_cast(i)); -+ if (!IsZero(bCopy(iInt, zInt))) - return false; - } - -@@ -138,13 +150,16 @@ namespace CoCoADortmund - while (!positions.empty()) - { - const size_t i = positions.back().first, j = positions.back().second; -+ const MachineInt iInt(static_cast(i)); -+ const MachineInt jInt(static_cast(j)); - -- RingElem x(bCopy(i, 0)); -+ RingElem x(bCopy(iInt, zInt)); - for (size_t k = j + 1; k < NumColsM; ++k) - { -- x -= MCopy(i, k) * x0Tmp(k, 0); -+ const MachineInt kInt(static_cast(k)); -+ x -= MCopy(iInt, kInt) * x0Tmp(kInt, zInt); - } -- SetEntry(x0Tmp, j, 0, x/MCopy(i, j)); -+ SetEntry(x0Tmp, j, 0, x/MCopy(iInt, jInt)); - - positions.pop_back(); - } diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 9e37dc7..df64e4d 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.6.0" -VERSIONREV="7" +VERSIONREV="25" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index b979c4d..a6919a3 100644 --- a/giac.spec +++ b/giac.spec @@ -1,20 +1,24 @@ # Tests excluded -# See http://pcm1.e.ujf-grenoble.fr/forum/viewtopic.php?f=19&t=1733&sid=3257f5085f4ae208dc36665f2873252f +# See https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=19&t=1733 %bcond_with check %if 0%{?fedora} >= 33 %bcond_without flexiblas %endif -%global subversion .7 +# giac does not support LTO +%define _lto_cflags %{nil} + +%global subversion .25 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.6.0%{subversion} -Release: 4%{?dist} +Release: 1%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* -License: GPLv3+ +# MIT: libmicropython.a +License: GPLv3+ 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/ @@ -26,12 +30,14 @@ Source2: xcas.appdata.xml # Recent math.h adds an iszero macro, but giac has an iszero function Patch0: %{name}-iszero.patch -# Adapt to cocoalib 0.99700 -Patch1: %{name}-cocoalib.patch - # Deal with LTO compromised configure test -Patch2: %{name}-config.patch +Patch1: %{name}-config.patch +# Use Fedora compiler flags +Patch2: %{name}-1.6.0-fix_micropy_compiler_flags.patch + +BuildRequires: autoconf, libtool +BuildRequires: python3-devel BuildRequires: readline-devel BuildRequires: gettext-devel BuildRequires: gcc-c++ @@ -45,9 +51,9 @@ BuildRequires: mpfr-devel BuildRequires: ntl-devel BuildRequires: pari-devel %if %{with flexiblas} -BuildRequires: flexiblas-devel +BuildRequires: flexiblas-devel %else -BuildRequires: blas-devel, lapack-devel +BuildRequires: blas-devel, lapack-devel %endif BuildRequires: mpfi-devel BuildRequires: mesa-libGL-devel @@ -60,10 +66,15 @@ BuildRequires: fltk-devel BuildRequires: libXinerama-devel BuildRequires: desktop-file-utils BuildRequires: libappstream-glib -BuildRequires: tex(latex), texinfo, texinfo-tex Provides: bundled(tinymt32) +# The micropython inside is a custom port with +# addtional built-in modules that are linked to giac. +Provides: libmicropython-static = 1.12 +Provides: libgiac-static = 1.6.0 +Provides: libxcas-static = 1.6.0 + %global majver %(cut -d. -f1-3 <<< %{version}) %description @@ -99,6 +110,7 @@ Development files for libgiac. Summary: Detailed html documentation for Giac/Xcas BuildArch: noarch BuildRequires: hevea +BuildRequires: tex(latex), texinfo, texinfo-tex, texlive-stmaryrd # Javascript provided Provides: bundled(CodeMirror) @@ -144,11 +156,6 @@ with Giac computations. # Remove local intl (already bundled in fedora) rm -rf intl/*.h rm -rf intl/*.cc -# NB: Problem with autoreconf: missing config/test-driver . If needed the -# following worked -# aclocal -# autoconf -# automake --add-missing # Remove unecessary files and force the rebuild of info. rm -f doc/pari/gphtml @@ -173,15 +180,21 @@ rm -f config/texinfo.tex rm -f examples/Exemples/demo/._* rm -f examples/Exemples/analyse/._* -%build -export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" - %if %{with flexiblas} -sed -e 's|LIB(blas|LIB(flexiblas|g' -e 's|LIB(lapack|LIB(flexiblas|g' -i configure.in +sed -e 's|LIB(blas|LIB(flexiblas|g' -e 's|LIB(lapack|LIB(flexiblas|g' -i configure.ac sed -e 's|-lblas|-lflexiblas|g' -e 's|-llapack|-lflexiblas|g' -i configure %endif -%configure --enable-static=no --with-included-gettext=no --enable-nls=yes \ +# Prepare Micropython lib's License +cp -p micropython-1.12/LICENSE micropython-1.12/micropython-LICENSE + +# Needs a reconfiguration +autoreconf -ivf + +%build +export CXXFLAGS="-std=gnu++14 %build_cxxflags" +export CFLAGS="%build_cflags" +%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 \ --enable-ntl=yes --enable-gmpxx=yes --enable-cocoa=autodetect \ @@ -194,6 +207,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # Fix unused-direct-shlib-dependency with libgslcblas.so.0 and libgfortran.so.3 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +export CXXFLAGS="-std=gnu++14 %build_cxxflags" +export CFLAGS_FEDORA="%build_cflags" +export LDFLAGS_FEDORA="%build_ldflags" %make_build V=1 # Rebuild giac_*.info and Convert info file to utf-8 @@ -208,6 +224,13 @@ done %install %make_install +# Install libmicropython.a library +install -pm 644 libmicropython.a %{buildroot}%{_libdir}/ + +# Install libxcas.a library +install -pm 644 src/.libs/libxcas.a %{buildroot}%{_libdir}/ +install -pm 644 src/.libs/libgiac.a %{buildroot}%{_libdir}/ + cp -p src/tinymt32_license.h LICENSE.tinymt32 # Remove unwanted files. @@ -297,8 +320,6 @@ find %{buildroot}%{_datadir}/giac/doc -maxdepth 2 -type l| \ grep -v -E "%{_datadir}/giac/doc/aide_cas$" | \ sed -e "s:%{buildroot}::" >>giacdoclist -%ldconfig_scriptlets - %if %{with check} %check export LD_LIBRARY_PATH=../src/.libs @@ -306,13 +327,16 @@ make -C check check %endif %files -f %{name}.lang -%license COPYING +%license COPYING micropython-1.12/micropython-LICENSE %license LICENSE.tinymt32 %{_bindir}/icas %{_bindir}/giac %{_bindir}/hevea2mml %{_bindir}/*_help %{_libdir}/libgiac.so.* +%{_libdir}/libgiac.a +%{_libdir}/libmicropython.a +%{_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) # Moreover, without aide_cas the keywords files are not found in icas @@ -405,6 +429,10 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 @@ -513,37 +541,37 @@ make -C check check * 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 +* 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 +* 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 +* 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 +* Thu Dec 21 2017 Antonio Trande 1.4.9.41-3 - Symlink restored -* Thu Dec 21 2017 Antonio Trande 1.4.9.41-2 +* 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 +* 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 +* 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 +* 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 +* 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 @@ -553,7 +581,7 @@ make -C check check * 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 +* 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 @@ -562,20 +590,20 @@ make -C check check * 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 +* 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 +* 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 +* 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 @@ -584,30 +612,30 @@ make -C check check * 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 +* 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 +* 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 +* 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 +* 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 +* 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 @@ -616,31 +644,31 @@ make -C check check * 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 +* 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 +* Thu Jul 07 2016 Antonio Trande 1.2.2-6.63 - Exclude s390x -* Sat Jul 02 2016 Antonio Trande 1.2.2-5.63 +* 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 +* 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 +* 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 +* 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 +* Fri May 13 2016 Antonio Trande 1.2.2-1 - Update to 1.2.2 - pgiac script packaged separately - Fix cSolveorder check diff --git a/sources b/sources index 1361492..6d7c54e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.6.0.7.tar.gz) = 20757c8ac6555f367823400fbf948b117cf27ffa40e48084c89eaba24fbafe716732a28e1310e5d3e26fae1448b2398e50c36a11b89c3a89980e0eed1baba9b5 +SHA512 (giac-1.6.0.25.tar.gz) = 9ea9bada0592267d267df31706fefa2a5928258d215d844088e8a8a1f10d9d7015ee02bce00ed51b64fb006c03b0b93d00e878bc8bc6bf08f96686d5265fffa5 From 4be4ac9468fdc15f036c8db7c2ef16ac94d4a1d1 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 11 Nov 2020 13:54:06 -0700 Subject: [PATCH 035/104] Rebuild for pari 2.13.0. Bring back (modified) cocoalib patch, still needed for cocoalib support. --- giac-cocoalib.patch | 163 ++++++++++++++++++++++++++++++++++++++++++++ giac.spec | 10 ++- 2 files changed, 172 insertions(+), 1 deletion(-) create mode 100644 giac-cocoalib.patch diff --git a/giac-cocoalib.patch b/giac-cocoalib.patch new file mode 100644 index 0000000..f910f9f --- /dev/null +++ b/giac-cocoalib.patch @@ -0,0 +1,163 @@ +--- configure.ac.orig 2020-04-30 01:52:40.000000000 -0600 ++++ configure.ac 2020-10-27 17:05:31.732729921 -0600 +@@ -272,7 +272,7 @@ AC_ARG_ENABLE([cocoa], + [if test "$enableval" = "no"; then CONFIG_COCOA="no"; fi], []) + + if test "$CONFIG_COCOA" = "yes"; then +- AC_CHECK_HEADER(CoCoA/io.H, [], [CONFIG_COCOA="no"]) ++ AC_CHECK_HEADER(CoCoA/BigInt.H, [], [CONFIG_COCOA="no"]) + fi + if test "$CONFIG_COCOA" = "yes"; then + save_LIBS="$LIBS" +--- configure.orig 2020-04-30 01:52:40.000000000 -0600 ++++ configure 2020-10-27 17:06:22.817658796 -0600 +@@ -16662,8 +16662,8 @@ fi + + + if test "$CONFIG_COCOA" = "yes"; then +- ac_fn_cxx_check_header_mongrel "$LINENO" "CoCoA/io.H" "ac_cv_header_CoCoA_io_H" "$ac_includes_default" +-if test "x$ac_cv_header_CoCoA_io_H" = xyes; then : ++ ac_fn_cxx_check_header_mongrel "$LINENO" "CoCoA/BigInt.H" "ac_cv_header_CoCoA_BigInt_H" "$ac_includes_default" ++if test "x$ac_cv_header_CoCoA_BigInt_H" = xyes; then : + + else + CONFIG_COCOA="no" +--- src/TmpFGLM.C.orig 2019-11-03 11:23:52.000000000 -0700 ++++ src/TmpFGLM.C 2020-11-06 09:58:43.358885872 -0700 +@@ -109,14 +109,14 @@ namespace CoCoADortmund + void FGLMBasisConversion(vector& NewGB, const vector& OldGB, const PPOrdering& NewOrdering) + { + if (OldGB.empty()) +- CoCoA_ERROR(ERR::nonstandard, "FGLMBasisConversion: empty Groebner Basis vector"); ++ CoCoA_THROW_ERROR(ERR::nonstandard, "FGLMBasisConversion: empty Groebner Basis vector"); + + // Check if generated ideal is zero-dimensional + // const ideal I(AsSparsePolyRing(owner(OldGB.front())), OldGB); + const ideal I(SparsePolyRing(static_cast + (owner(OldGB.front()).myRawPtr())), OldGB); + if (!IsZeroDim(I)) +- CoCoA_ERROR(ERR::nonstandard, "FGLMBasisConversion: ideal must be 0-dimensional"); ++ CoCoA_THROW_ERROR(ERR::nonstandard, "FGLMBasisConversion: ideal must be 0-dimensional"); + + // Initialization of objects needed for computation + // const SparsePolyRing Kx = AsSparsePolyRing(owner(OldGB.front())); +--- src/TmpLESystemSolver.C.orig 2019-11-03 11:20:03.000000000 -0700 ++++ src/TmpLESystemSolver.C 2020-11-06 09:38:58.349024036 -0700 +@@ -29,6 +29,7 @@ + #include "CoCoA/matrix.H" + #include "CoCoA/ring.H" + #include "CoCoA/error.H" ++#include "CoCoA/MachineInt.H" + + // #include // Included by DenseMatrix.H + using std::vector; +@@ -50,7 +51,11 @@ namespace CoCoADortmund + + for (size_t row = 0; row < NumRowsMSource; ++row) + for (size_t col = 0; col < NumColsMSource; ++col) +- SetEntry(MTarget, row, col, MSource(row, col)); ++ { ++ const MachineInt rowInt(static_cast(row)); ++ const MachineInt colInt(static_cast(col)); ++ SetEntry(MTarget, row, col, MSource(rowInt, colInt)); ++ } + } + + // Solve the linear system M*x = b by using Gauss' algorithm +@@ -60,22 +65,23 @@ namespace CoCoADortmund + const size_t NumColsM = NumCols(M); + const size_t NumRowsb = NumRows(b); + const size_t NumColsb = NumCols(b); ++ const MachineInt zInt(0); + + // Dimension check + if (NumRowsM != NumRowsb) +- CoCoA_ERROR(ERR::BadMatrixSize, "mySolve: M and b must have same number of rows."); ++ CoCoA_THROW_ERROR(ERR::BadMatrixSize, "mySolve: M and b must have same number of rows."); + if (NumColsM != NumRows(x0)) +- CoCoA_ERROR(ERR::BadMatrixSize, "mySolve: M and x0 must have same number of columns."); ++ CoCoA_THROW_ERROR(ERR::BadMatrixSize, "mySolve: M and x0 must have same number of columns."); + if (NumCols(x0) != 1) +- CoCoA_ERROR(ERR::BadMatrixSize, "mySolve: NumCols(x0) > 1."); ++ CoCoA_THROW_ERROR(ERR::BadMatrixSize, "mySolve: NumCols(x0) > 1."); + if (NumColsb != 1) +- CoCoA_ERROR(ERR::BadMatrixSize, "mySolve: NumCols(b) > 1."); ++ CoCoA_THROW_ERROR(ERR::BadMatrixSize, "mySolve: NumCols(b) > 1."); + + // Field check; should we also check if BaseRing(M) = BaseRing(b) = BaseRing(x0)? + // ring K(BaseRing(M)); + ring K(RingOf(M)); + if (!IsField(K)) +- CoCoA_ERROR(ERR::NotField, "mySolve: Gauss' algorithm over non-fields not yet implemented."); ++ CoCoA_THROW_ERROR(ERR::NotField, "mySolve: Gauss' algorithm over non-fields not yet implemented."); + + // Create working copies of M and b + matrix MCopy(NewDenseMat(K, NumRowsM, NumColsM)); +@@ -91,13 +97,17 @@ namespace CoCoADortmund + size_t row = 0; + for (size_t col = 0; col < NumColsM && row < NumRowsM; ++col) + { ++ const MachineInt rowInt(static_cast(row)); ++ const MachineInt colInt(static_cast(col)); ++ + // Check if current column contains an element != 0 +- if (IsZero(MCopy(row, col))) ++ if (IsZero(MCopy(rowInt, colInt))) + { + size_t i = row+1; + for ( ; i < NumRowsM; ++i) + { +- if (!IsZero(MCopy(i, col))) ++ const MachineInt iInt(static_cast(i)); ++ if (!IsZero(MCopy(iInt, colInt))) + { + // Switch MCopy and bCopy rows + MCopy->mySwapRows(i, row); +@@ -113,13 +123,14 @@ namespace CoCoADortmund + positions.push_back(make_pair(row, col)); + + // Found an element != 0 in current column; apply elemination +- c = MCopy(row, col); ++ c = MCopy(rowInt, colInt); + + for (size_t i = row+1; i < NumRowsM; ++i) + { + // Transform MCopy and bCopy +- bCopy->myAddRowMul(i, row, -MCopy(i, col)/c); +- MCopy->myAddRowMul(i, row, -MCopy(i, col)/c); ++ const MachineInt iInt(static_cast(i)); ++ bCopy->myAddRowMul(i, row, -MCopy(iInt, colInt)/c); ++ MCopy->myAddRowMul(i, row, -MCopy(iInt, colInt)/c); + } + + ++row; +@@ -128,7 +139,8 @@ namespace CoCoADortmund + // row = rank(MCopy); check if a solution for the equation system exists + for (size_t i = row; i < NumRowsb; ++i) + { +- if (!IsZero(bCopy(i, 0))) ++ const MachineInt iInt(static_cast(i)); ++ if (!IsZero(bCopy(iInt, zInt))) + return false; + } + +@@ -138,13 +150,16 @@ namespace CoCoADortmund + while (!positions.empty()) + { + const size_t i = positions.back().first, j = positions.back().second; ++ const MachineInt iInt(static_cast(i)); ++ const MachineInt jInt(static_cast(j)); + +- RingElem x(bCopy(i, 0)); ++ RingElem x(bCopy(iInt, zInt)); + for (size_t k = j + 1; k < NumColsM; ++k) + { +- x -= MCopy(i, k) * x0Tmp(k, 0); ++ const MachineInt kInt(static_cast(k)); ++ x -= MCopy(iInt, kInt) * x0Tmp(kInt, zInt); + } +- SetEntry(x0Tmp, j, 0, x/MCopy(i, j)); ++ SetEntry(x0Tmp, j, 0, x/MCopy(iInt, jInt)); + + positions.pop_back(); + } diff --git a/giac.spec b/giac.spec index a6919a3..aa4a8d7 100644 --- a/giac.spec +++ b/giac.spec @@ -14,7 +14,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.6.0%{subversion} -Release: 1%{?dist} +Release: 2%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -36,11 +36,15 @@ Patch1: %{name}-config.patch # Use Fedora compiler flags Patch2: %{name}-1.6.0-fix_micropy_compiler_flags.patch +# Adapt to cocoalib 0.99700 +Patch3: %{name}-cocoalib.patch + BuildRequires: autoconf, libtool BuildRequires: python3-devel BuildRequires: readline-devel BuildRequires: gettext-devel BuildRequires: gcc-c++ +BuildRequires: make BuildRequires: cocoalib-devel BuildRequires: glpk-devel BuildRequires: gmp-devel @@ -429,6 +433,10 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 81a218c6cbb4a0338badfe5d39a55f8ab1912f48 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 08:02:02 +0000 Subject: [PATCH 036/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 aa4a8d7..fbf552b 100644 --- a/giac.spec +++ b/giac.spec @@ -14,7 +14,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.6.0%{subversion} -Release: 2%{?dist} +Release: 3%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -433,6 +433,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 06a9abe23725da5a6f2d99bc5a5edbfee313a1a4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 17 Feb 2021 20:42:49 -0700 Subject: [PATCH 037/104] Rebuild for cocoalib 0.99712 - Work harder to avoid depending on libgslcblas --- giac.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/giac.spec b/giac.spec index fbf552b..e572646 100644 --- a/giac.spec +++ b/giac.spec @@ -14,7 +14,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.6.0%{subversion} -Release: 3%{?dist} +Release: 4%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -185,8 +185,8 @@ rm -f examples/Exemples/demo/._* rm -f examples/Exemples/analyse/._* %if %{with flexiblas} -sed -e 's|LIB(blas|LIB(flexiblas|g' -e 's|LIB(lapack|LIB(flexiblas|g' -i configure.ac -sed -e 's|-lblas|-lflexiblas|g' -e 's|-llapack|-lflexiblas|g' -i configure +sed -e 's|LIB(blas|LIB(flexiblas|g' -e 's|LIB(lapack|LIB(flexiblas|g' \ + -e 's|-lgslcblas|-lflexiblas|' -i configure.ac %endif # Prepare Micropython lib's License @@ -433,6 +433,10 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 28d0c2844e5220f721d6bbb9ce79b082230c1e2b Mon Sep 17 00:00:00 2001 From: Antonio Trande <3974791-anto.trande@users.noreply.gitlab.com> Date: Thu, 25 Mar 2021 18:05:05 +0100 Subject: [PATCH 038/104] Fix Version tag in desktop file --- giac.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/giac.spec b/giac.spec index e572646..300730d 100644 --- a/giac.spec +++ b/giac.spec @@ -14,7 +14,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.6.0%{subversion} -Release: 4%{?dist} +Release: 5%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -246,7 +246,6 @@ rm -f %{buildroot}%{_libdir}/libgiac.la # because make install will then require hevea as an extra (and big) dependancy and I guess # that it will recreate those empty files, so it's better to delete them here. find %{buildroot} -size 0 -delete -find %{buildroot} -name *~ -delete # Obsolete symbolic link rm -f %{buildroot}%{_bindir}/xcasnew # @@ -289,8 +288,10 @@ mkdir -p %{buildroot}%{_datadir}/giac/doc/fr (cd %{buildroot}%{_datadir}/giac/doc/fr ; ln -s ../en/cascmd_en cascmd_fr ) %find_lang %{name} -desktop-file-install --vendor="" --remove-key=Encoding --dir=%{buildroot}%{_datadir}/applications/\ - %{buildroot}%{_datadir}/applications/xcas.desktop +desktop-file-install --vendor="" --remove-key=Encoding \ + --set-key=Version --set-value=1.0 \ + --dir=%{buildroot}%{_datadir}/applications/ \ + %{buildroot}%{_datadir}/applications/xcas.desktop # Create a list of files non required at runtime by icas nor xcas # that are under %%{_datadir}/giac/doc for packaging in giac-doc @@ -433,6 +434,10 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 03f781cb78ba84246ce768e34660bf7762cfb411 Mon Sep 17 00:00:00 2001 From: Antonio Trande <3974791-anto.trande@users.noreply.gitlab.com> Date: Thu, 25 Mar 2021 21:20:43 +0100 Subject: [PATCH 039/104] Release 1.7.0 --- .gitignore | 1 + giac-makesrc.sh | 4 ++-- giac.spec | 34 +++++++++++++++++++---------- sources | 2 +- xcas.appdata.xml | 57 ------------------------------------------------ 5 files changed, 26 insertions(+), 72 deletions(-) delete mode 100644 xcas.appdata.xml diff --git a/.gitignore b/.gitignore index f7771b0..058efd4 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /giac-1.5.0.85.tar.gz /giac-1.6.0.7.tar.gz /giac-1.6.0.25.tar.gz +/giac-1.7.0.1.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index df64e4d..f52a4e9 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -4,8 +4,8 @@ # package maintainer. # -VERSION="1.6.0" -VERSIONREV="25" +VERSION="1.7.0" +VERSIONREV="1" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index 300730d..c93005b 100644 --- a/giac.spec +++ b/giac.spec @@ -2,19 +2,17 @@ # See https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=19&t=1733 %bcond_with check -%if 0%{?fedora} >= 33 %bcond_without flexiblas -%endif # giac does not support LTO %define _lto_cflags %{nil} -%global subversion .25 +%global subversion .1 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry -Version: 1.6.0%{subversion} -Release: 5%{?dist} +Version: 1.7.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 @@ -25,7 +23,6 @@ URL: http://www-fourier.ujf-grenoble.fr/~parisse/giac.html ## and re-packed without non-free FR documentation by giac-makesrc script. Source0: %{name}-%{version}.tar.gz Source1: %{name}-makesrc.sh -Source2: xcas.appdata.xml # Recent math.h adds an iszero macro, but giac has an iszero function Patch0: %{name}-iszero.patch @@ -192,7 +189,10 @@ sed -e 's|LIB(blas|LIB(flexiblas|g' -e 's|LIB(lapack|LIB(flexiblas|g' \ # Prepare Micropython lib's License cp -p micropython-1.12/LICENSE micropython-1.12/micropython-LICENSE -# Needs a reconfiguration +# Update configure.ac obsolete macros +autoupdate -vf + +# Re-configuration autoreconf -ivf %build @@ -240,24 +240,29 @@ cp -p src/tinymt32_license.h LICENSE.tinymt32 # Remove unwanted files. rm -f %{buildroot}%{_infodir}/dir rm -rf %{buildroot}%{_datadir}/application-registry + # The .la is still built despite the built of libgiac.a has been disabled rm -f %{buildroot}%{_libdir}/libgiac.la + # I have tried to remove the empty files in the setup stage, it was not a good idea # because make install will then require hevea as an extra (and big) dependancy and I guess # that it will recreate those empty files, so it's better to delete them here. find %{buildroot} -size 0 -delete + # Obsolete symbolic link rm -f %{buildroot}%{_bindir}/xcasnew # + +# Remove wasm file (??) with Bad Magic Number +rm -f %{buildroot}%{_docdir}/giacwasm.wasm + # Mime package was not installed. install -pm 644 -D debian/giac.sharedmimeinfo \ %{buildroot}%{_datadir}/mime/packages/giac.xml # -# Install/check appdata file. -install -pm 644 -D %{SOURCE2} \ - %{buildroot}%{_datadir}/metainfo/xcas.appdata.xml -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml +# Check appdata file +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml # # Add extra pdf docs. (NB: make dvi gives only the same doc in dvi format) @@ -386,7 +391,7 @@ make -C check check # Files under dirs shared with other packages %{_datadir}/applications/xcas.desktop -%{_datadir}/metainfo/xcas.appdata.xml +%{_metainfodir}/xcas.metainfo.xml %{_datadir}/mime/packages/giac.xml %{_datadir}/pixmaps/xcas.xpm %{_datadir}/icons/hicolor/*/apps/xcas.png @@ -434,6 +439,11 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 diff --git a/sources b/sources index 6d7c54e..3c4533e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.6.0.25.tar.gz) = 9ea9bada0592267d267df31706fefa2a5928258d215d844088e8a8a1f10d9d7015ee02bce00ed51b64fb006c03b0b93d00e878bc8bc6bf08f96686d5265fffa5 +SHA512 (giac-1.7.0.1.tar.gz) = 371860e5d77436d36dcaf81c7a706a390b0987f427ae929d021cbc243b9899fea75723d56eedecb335437a5c9278301a3dde3d265fa223d69867d4ff99e1e574 diff --git a/xcas.appdata.xml b/xcas.appdata.xml deleted file mode 100644 index 29740af..0000000 --- a/xcas.appdata.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - xcas.desktop - CC0-1.0 - Computer Algebra System, Symbolic calculus, Geometry - xcas - GPL-3.0+ - - Education - Math - - -

- Giac is a Computer Algebra System made by Bernard Parisse. It provides - features from the C/C++ libraries PARI, NTL (arithmetic), GSL (numerics), - GMP (big integers), MPFR (bigfloats) and also:

-
    -
  • Efficient algorithms for multivariate polynomial operations - (product, GCD, factorization, groebner bases)
    • -
  • Symbolic computations: solver, simplifications, limits/series, - integration
    • -
  • Linear algebra with numerical or symbolic coefficients
    • -
  • Partial Maple and TI compatibility
    • -
  • It has interfaces in texmacs and sagemath
    • -
-

It consists of:

-
    -
  • A C++ library (libgiac)
    • -
  • A command line interpreter (icas/giac)
    • -
  • An FLTK-based GUI (xcas) with interactive geometry and formal - spreadsheets
    • -
- - giac - http://www-fourier.ujf-grenoble.fr/~parisse/giac.html - http://xcas.e.ujf-grenoble.fr/XCAS/ - - - https://sagitter.fedorapeople.org/giac-screenshots/xcas1.png - Newton's method - - - https://sagitter.fedorapeople.org/giac-screenshots/xcas2.png - Hexagon animation - - - https://sagitter.fedorapeople.org/giac-screenshots/xcas3.png - Animated cube - - - https://sagitter.fedorapeople.org/giac-screenshots/xcas4.png - Spreadsheet showing Newton's method - - - sagitter_at_fedoraproject.org - Bernard Parisse - From 05a80c76ce5035abb8232045362b09a152923193 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sat, 12 Jun 2021 17:26:00 +0200 Subject: [PATCH 040/104] Update to 1.7.0 sub-13 --- .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 058efd4..0557419 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /giac-1.6.0.7.tar.gz /giac-1.6.0.25.tar.gz /giac-1.7.0.1.tar.gz +/giac-1.7.0.13.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index f52a4e9..f5b27d1 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.7.0" -VERSIONREV="1" +VERSIONREV="13" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index c93005b..c2f8d2b 100644 --- a/giac.spec +++ b/giac.spec @@ -7,7 +7,7 @@ # giac does not support LTO %define _lto_cflags %{nil} -%global subversion .1 +%global subversion .13 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry @@ -439,6 +439,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 diff --git a/sources b/sources index 3c4533e..c5af503 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.7.0.1.tar.gz) = 371860e5d77436d36dcaf81c7a706a390b0987f427ae929d021cbc243b9899fea75723d56eedecb335437a5c9278301a3dde3d265fa223d69867d4ff99e1e574 +SHA512 (giac-1.7.0.13.tar.gz) = d173e3b5fb35bd516e58882d6a77829b8b202cf1c3b346418e237e2afbb1a310e9407b8174c708aeecdb5950dc38560ac2390ad2ad7995fdedbd85114bb310b4 From e02076f583de1c64fd17f8e2388d5c50c228c2b7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 17 Jun 2021 12:56:36 -0600 Subject: [PATCH 041/104] Rebuild for cocoalib 0.99713. Build with cliquer support. --- giac.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index c2f8d2b..d4a1492 100644 --- a/giac.spec +++ b/giac.spec @@ -12,7 +12,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.7.0%{subversion} -Release: 1%{?dist} +Release: 2%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -42,6 +42,7 @@ BuildRequires: readline-devel BuildRequires: gettext-devel BuildRequires: gcc-c++ BuildRequires: make +BuildRequires: cliquer-devel BuildRequires: cocoalib-devel BuildRequires: glpk-devel BuildRequires: gmp-devel @@ -439,6 +440,10 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From cdda35c0e6667521e537d65ab1dfdb1994099c8e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 29 Jun 2021 13:47:41 -0600 Subject: [PATCH 042/104] Rebuild for ntl 11.5.1. --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index d4a1492..b2994cf 100644 --- a/giac.spec +++ b/giac.spec @@ -12,7 +12,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.7.0%{subversion} -Release: 2%{?dist} +Release: 3%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -440,6 +440,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 0dbd8a4a1cc71227bef2a5ee3a9efc95efc99f7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 01:34:26 +0000 Subject: [PATCH 043/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 b2994cf..49c9607 100644 --- a/giac.spec +++ b/giac.spec @@ -12,7 +12,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.7.0%{subversion} -Release: 3%{?dist} +Release: 4%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -440,6 +440,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 65c1249fc9680818978218d24b3a1edd1b683412 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 8 Sep 2021 14:48:58 +0200 Subject: [PATCH 044/104] Update to 1.7.0 sub-29 --- .gitignore | 1 + giac-config.patch | 4 ++-- giac-fix_graphe_file.patch | 11 +++++++++++ giac-iszero.patch | 4 ++-- giac-makesrc.sh | 2 +- giac.spec | 22 ++++++++++++++++++---- sources | 2 +- 7 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 giac-fix_graphe_file.patch diff --git a/.gitignore b/.gitignore index 0557419..b1cb26c 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /giac-1.6.0.25.tar.gz /giac-1.7.0.1.tar.gz /giac-1.7.0.13.tar.gz +/giac-1.7.0.29.tar.gz diff --git a/giac-config.patch b/giac-config.patch index c7c4658..4e69123 100644 --- a/giac-config.patch +++ b/giac-config.patch @@ -1,7 +1,7 @@ diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4 index b8d7817..23fdc1d 100644 ---- m4/intdiv0.m4 -+++ m4/intdiv0.m4 +--- a/m4/intdiv0.m4 ++++ b/m4/intdiv0.m4 @@ -29,10 +29,10 @@ sigfpe_handler (sig) int sig; exit (sig != SIGFPE); } diff --git a/giac-fix_graphe_file.patch b/giac-fix_graphe_file.patch new file mode 100644 index 0000000..c171d66 --- /dev/null +++ b/giac-fix_graphe_file.patch @@ -0,0 +1,11 @@ +--- a/src/graphe.orig.cc 2021-09-06 21:27:18.514049316 +0200 ++++ b/src/graphe.cc 2021-09-06 21:27:17.150072679 +0200 +@@ -15704,7 +15704,7 @@ + continue; + std::sort(d.begin(),d.end()); + if (d==d0) { +- G.make_haar_graph(n); ++ G.make_haar_graph(int(n)); + if (is_isomorphic(G,isom,false)) { + spec.push_back(make_ivector(2,_GT_SEQ_HAAR,n)); + break; diff --git a/giac-iszero.patch b/giac-iszero.patch index 85a75fd..1e49543 100644 --- a/giac-iszero.patch +++ b/giac-iszero.patch @@ -1,5 +1,5 @@ ---- src/vecteur.h.orig 2016-05-30 05:53:13.000000000 -0600 -+++ src/vecteur.h 2016-10-20 12:06:16.321062870 -0600 +--- a/src/vecteur.h.orig 2016-05-30 05:53:13.000000000 -0600 ++++ b/src/vecteur.h 2016-10-20 12:06:16.321062870 -0600 @@ -27,6 +27,8 @@ #include #endif // HAVE_LIBGSL diff --git a/giac-makesrc.sh b/giac-makesrc.sh index f5b27d1..b6c70d0 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.7.0" -VERSIONREV="13" +VERSIONREV="29" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index 49c9607..5e59257 100644 --- a/giac.spec +++ b/giac.spec @@ -7,12 +7,12 @@ # giac does not support LTO %define _lto_cflags %{nil} -%global subversion .13 +%global subversion .29 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.7.0%{subversion} -Release: 4%{?dist} +Release: 1%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -36,6 +36,9 @@ Patch2: %{name}-1.6.0-fix_micropy_compiler_flags.patch # Adapt to cocoalib 0.99700 Patch3: %{name}-cocoalib.patch +# https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=3&t=2724 +Patch4: %{name}-fix_graphe_file.patch + BuildRequires: autoconf, libtool BuildRequires: python3-devel BuildRequires: readline-devel @@ -130,7 +133,7 @@ removed from the original source due to non free Licence. # The name Xcas is better known than the name giac itself, # so many users will search for the name xcas instead of giac or giac-gui. Summary: GUI application for Giac -Provides: xcas = %{version}-%{release} +Provides: xcas%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: hicolor-icon-theme @@ -153,7 +156,15 @@ The pgiac command is a perl script to mix Latex documents with Giac computations. %prep -%autosetup -p0 -n %{name}-%{majver} +%autosetup -p0 -n %{name}-%{majver} -N + +%patch0 -p1 +%patch1 -p1 +%patch2 -p0 +%patch3 -p0 +%ifarch %{arm} %{ix86} +%patch4 -p1 +%endif # Remove local intl (already bundled in fedora) rm -rf intl/*.h @@ -440,6 +451,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 diff --git a/sources b/sources index c5af503..9231452 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.7.0.13.tar.gz) = d173e3b5fb35bd516e58882d6a77829b8b202cf1c3b346418e237e2afbb1a310e9407b8174c708aeecdb5950dc38560ac2390ad2ad7995fdedbd85114bb310b4 +SHA512 (giac-1.7.0.29.tar.gz) = 79d21d11d345e7fc917e24fd7e6fe71fa2389d506d2977dd91a64aa4ab3480c3d7a06a2167eef7a838cd55ef65830f42020b35688f0df8619e347fca079aef39 From 2ac568d9356177021ebfb4d3d40f20a525ff5bed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 05:55:33 +0000 Subject: [PATCH 045/104] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 5e59257..894e26d 100644 --- a/giac.spec +++ b/giac.spec @@ -12,7 +12,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.7.0%{subversion} -Release: 1%{?dist} +Release: 2%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -451,6 +451,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From bef60c6e7bee7eca1e17a305f3effc7f9c5ed6d3 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 24 Mar 2022 15:56:37 -0600 Subject: [PATCH 046/104] Rebuild for cocoalib 0.99800. --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index 894e26d..b274c84 100644 --- a/giac.spec +++ b/giac.spec @@ -12,7 +12,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.7.0%{subversion} -Release: 2%{?dist} +Release: 3%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -451,6 +451,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 7f0e398625423baf400f31e62b8a72157a2445d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 06:10:35 +0000 Subject: [PATCH 047/104] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 b274c84..fb03c21 100644 --- a/giac.spec +++ b/giac.spec @@ -12,7 +12,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.7.0%{subversion} -Release: 3%{?dist} +Release: 4%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -451,6 +451,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 6c8284cb0fff9be5324b256f69544f67ecdefdef Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 18 Aug 2022 19:21:36 +0200 Subject: [PATCH 048/104] Update to 1.9.0 sub-19 --- .gitignore | 1 + giac-1.9.0-bug2792.patch | 11 +++++++++++ giac-fix_graphe_file.patch | 6 +++--- giac-makesrc.sh | 4 ++-- giac.spec | 32 ++++++++++++++++++-------------- sources | 2 +- 6 files changed, 36 insertions(+), 20 deletions(-) create mode 100644 giac-1.9.0-bug2792.patch diff --git a/.gitignore b/.gitignore index b1cb26c..c169609 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /giac-1.7.0.1.tar.gz /giac-1.7.0.13.tar.gz /giac-1.7.0.29.tar.gz +/giac-1.9.0.19.tar.gz diff --git a/giac-1.9.0-bug2792.patch b/giac-1.9.0-bug2792.patch new file mode 100644 index 0000000..1c89946 --- /dev/null +++ b/giac-1.9.0-bug2792.patch @@ -0,0 +1,11 @@ +--- a/src/optimization.orig.cc 2022-04-11 09:52:40.000000000 +0200 ++++ b/src/optimization.cc 2022-08-18 17:58:16.714974337 +0200 +@@ -4825,7 +4825,7 @@ + *kt=initp[i]; + ok=compute_obj_val(*kt->_VECTptr,*ft); + } else *kt=vecteur(0); +- if ((i>=ips || !ok) && !make_random_initial_point(*kt->_VECTptr,ft)) ++ if ((i>=ips || !ok) && !make_random_initial_point(*kt->_VECTptr,&*ft)) + return false; + if (is_strictly_greater(best_obj_val,*ft,ctx)) { + best_obj_val=*ft; diff --git a/giac-fix_graphe_file.patch b/giac-fix_graphe_file.patch index c171d66..5129aa9 100644 --- a/giac-fix_graphe_file.patch +++ b/giac-fix_graphe_file.patch @@ -1,11 +1,11 @@ --- a/src/graphe.orig.cc 2021-09-06 21:27:18.514049316 +0200 +++ b/src/graphe.cc 2021-09-06 21:27:17.150072679 +0200 -@@ -15704,7 +15704,7 @@ +@@ -15757,7 +15757,7 @@ continue; std::sort(d.begin(),d.end()); if (d==d0) { - G.make_haar_graph(n); + G.make_haar_graph(int(n)); if (is_isomorphic(G,isom,false)) { - spec.push_back(make_ivector(2,_GT_SEQ_HAAR,n)); - break; + vecteur v(k); + for (int i=0;i 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 diff --git a/sources b/sources index 9231452..e891fba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.7.0.29.tar.gz) = 79d21d11d345e7fc917e24fd7e6fe71fa2389d506d2977dd91a64aa4ab3480c3d7a06a2167eef7a838cd55ef65830f42020b35688f0df8619e347fca079aef39 +SHA512 (giac-1.9.0.19.tar.gz) = ff8ad4c1176ca40811a7358224e2fbc80c47a899decb838ad8c5d036e66e41fbc905b05f1c6e689d805850fe52e118c5b8c493a2a3c76c679f1243b8f2389938 From b1f65dc53da7ac5581077b00f90ad700f39d7e02 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Aug 2022 17:06:51 +0900 Subject: [PATCH 049/104] Rebuild for gsl-2.7.1 --- giac.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giac.spec b/giac.spec index d7e0e28..34c16e4 100644 --- a/giac.spec +++ b/giac.spec @@ -9,7 +9,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 1%{?dist} +Release: 2%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -452,6 +452,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 98bd5fdb05285d6ef1fc74513bec4708dc30b500 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 27 Sep 2022 16:47:11 -0600 Subject: [PATCH 050/104] Rebuild for pari 2.15.0 --- giac-pari2.15.patch | 30 ++++++++++++++++++++++++++++++ giac.spec | 9 ++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 giac-pari2.15.patch diff --git a/giac-pari2.15.patch b/giac-pari2.15.patch new file mode 100644 index 0000000..ae0b52f --- /dev/null +++ b/giac-pari2.15.patch @@ -0,0 +1,30 @@ +--- giac-1.9.0/src/pari.cc.orig 2022-03-16 05:38:05.000000000 -0600 ++++ giac-1.9.0/src/pari.cc 2022-09-20 09:23:12.304717931 -0600 +@@ -749,7 +749,7 @@ namespace giac { + RET_INT=2, + RET_LONG=3 + }; +- typedef GEN (*PFGEN)(ANYARG); ++ typedef GEN (*PFGEN)(...); + + extern const unary_function_ptr * const at_pari; + static gen in_pari(const gen & args,GIAC_CONTEXT){ +@@ -884,15 +884,15 @@ namespace giac { + break; + + case RET_INT: +- m = (long)((int (*)(ANYARG))call)(_ARGS_); ++ m = (long)((int (*)(...))call)(_ARGS_); + res = stoi(m); break; + + case RET_LONG: +- m = ((long (*)(ANYARG))call)(_ARGS_); ++ m = ((long (*)(...))call)(_ARGS_); + res = stoi(m); break; + + case RET_VOID: +- ((void (*)(ANYARG))call)(_ARGS_); ++ ((void (*)(...))call)(_ARGS_); + res = gnil; break; + } + diff --git a/giac.spec b/giac.spec index 34c16e4..9b93123 100644 --- a/giac.spec +++ b/giac.spec @@ -9,7 +9,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 2%{?dist} +Release: 3%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -39,6 +39,9 @@ Patch4: %{name}-fix_graphe_file.patch # https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2792 Patch5: %{name}-1.9.0-bug2792.patch +# Adapt to pari 2.15.0 +Patch6: %{name}-pari2.15.patch + BuildRequires: autoconf, libtool BuildRequires: python3-devel BuildRequires: readline-devel @@ -166,6 +169,7 @@ with Giac computations. %ifarch s390x %patch5 -p1 -b .backup %endif +%patch6 -p1 -b .backup # Remove local intl (already bundled in fedora) rm -rf intl/*.h @@ -452,6 +456,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 76b190247d3d9f25c2a66161f775e72d8d950be7 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Tue, 22 Nov 2022 18:14:08 +0100 Subject: [PATCH 051/104] Update to 1.9.0 sub-29 --- .gitignore | 1 + giac-1.9.0-bug2792.patch | 11 ----------- giac-makesrc.sh | 2 +- giac.spec | 23 ++++++++++++----------- sources | 2 +- 5 files changed, 15 insertions(+), 24 deletions(-) delete mode 100644 giac-1.9.0-bug2792.patch diff --git a/.gitignore b/.gitignore index c169609..bf6d6cf 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /giac-1.7.0.13.tar.gz /giac-1.7.0.29.tar.gz /giac-1.9.0.19.tar.gz +/giac-1.9.0.29.tar.gz diff --git a/giac-1.9.0-bug2792.patch b/giac-1.9.0-bug2792.patch deleted file mode 100644 index 1c89946..0000000 --- a/giac-1.9.0-bug2792.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/optimization.orig.cc 2022-04-11 09:52:40.000000000 +0200 -+++ b/src/optimization.cc 2022-08-18 17:58:16.714974337 +0200 -@@ -4825,7 +4825,7 @@ - *kt=initp[i]; - ok=compute_obj_val(*kt->_VECTptr,*ft); - } else *kt=vecteur(0); -- if ((i>=ips || !ok) && !make_random_initial_point(*kt->_VECTptr,ft)) -+ if ((i>=ips || !ok) && !make_random_initial_point(*kt->_VECTptr,&*ft)) - return false; - if (is_strictly_greater(best_obj_val,*ft,ctx)) { - best_obj_val=*ft; diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 4f5f382..751e640 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.9.0" -VERSIONREV="19" +VERSIONREV="29" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index 9b93123..6b11d87 100644 --- a/giac.spec +++ b/giac.spec @@ -4,12 +4,12 @@ %bcond_without flexiblas -%global subversion .19 +%global subversion .29 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 3%{?dist} +Release: 1%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -36,11 +36,8 @@ Patch3: %{name}-cocoalib.patch # https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=3&t=2724 Patch4: %{name}-fix_graphe_file.patch -# https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2792 -Patch5: %{name}-1.9.0-bug2792.patch - # Adapt to pari 2.15.0 -Patch6: %{name}-pari2.15.patch +Patch5: %{name}-pari2.15.patch BuildRequires: autoconf, libtool BuildRequires: python3-devel @@ -166,10 +163,7 @@ with Giac computations. %patch2 -p0 -b .backup %patch3 -p0 -b .backup %patch4 -p1 -b .backup -%ifarch s390x %patch5 -p1 -b .backup -%endif -%patch6 -p1 -b .backup # Remove local intl (already bundled in fedora) rm -rf intl/*.h @@ -213,7 +207,9 @@ autoupdate -vf autoreconf -ivf %build -export CXXFLAGS="-std=gnu++14 %build_cxxflags" +# 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="%build_cflags" %configure --enable-static=yes --with-included-gettext=no --enable-nls=yes \ --enable-tommath=no --enable-debug=no --enable-gc=no --enable-sscl=no \ @@ -228,7 +224,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # Fix unused-direct-shlib-dependency with libgslcblas.so.0 and libgfortran.so.3 sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -export CXXFLAGS="-std=gnu++14 %build_cxxflags" +# 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="%build_cflags" export LDFLAGS_FEDORA="%build_ldflags" %make_build V=1 @@ -456,6 +454,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 diff --git a/sources b/sources index e891fba..89b7246 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.19.tar.gz) = ff8ad4c1176ca40811a7358224e2fbc80c47a899decb838ad8c5d036e66e41fbc905b05f1c6e689d805850fe52e118c5b8c493a2a3c76c679f1243b8f2389938 +SHA512 (giac-1.9.0.29.tar.gz) = 7e93dafa49aae5d15da5361eefaf761d0bfc70372e350436543685ff5c7ce5fb4ed648442652727f68e19a47392cf9f382e9769fdc79c8aeab27b117409cba29 From 8cf8f85659d8557056a1c300242d41b1704e5286 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 7 Dec 2022 11:29:37 +0100 Subject: [PATCH 052/104] C99 compatibility fixes (#2151473) Related to: --- giac-alloca-c99.patch | 8 ++++++++ giac-delete-fenv.patch | 23 +++++++++++++++++++++++ giac.spec | 11 ++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 giac-alloca-c99.patch create mode 100644 giac-delete-fenv.patch diff --git a/giac-alloca-c99.patch b/giac-alloca-c99.patch new file mode 100644 index 0000000..804aeae --- /dev/null +++ b/giac-alloca-c99.patch @@ -0,0 +1,8 @@ +--- giac-1.9.0.orig/micropython-1.12/xcas/mpconfigport.h 2022-04-11 09:52:40.000000000 +0200 ++++ giac-1.9.0/micropython-1.12/xcas/mpconfigport.h 2022-12-07 10:30:22.434868459 +0100 +@@ -151,4 +151,4 @@ + { MP_ROM_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \ + { MP_ROM_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj }, + +-/* #include */ ++#include diff --git a/giac-delete-fenv.patch b/giac-delete-fenv.patch new file mode 100644 index 0000000..91de4e3 --- /dev/null +++ b/giac-delete-fenv.patch @@ -0,0 +1,23 @@ +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.spec b/giac.spec index 6b11d87..a296ea3 100644 --- a/giac.spec +++ b/giac.spec @@ -9,7 +9,7 @@ Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 1%{?dist} +Release: 2%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -39,6 +39,9 @@ Patch4: %{name}-fix_graphe_file.patch # Adapt to pari 2.15.0 Patch5: %{name}-pari2.15.patch +Patch6: %{name}-alloca-c99.patch +Patch7: %{name}-delete-fenv.patch + BuildRequires: autoconf, libtool BuildRequires: python3-devel BuildRequires: readline-devel @@ -164,6 +167,8 @@ with Giac computations. %patch3 -p0 -b .backup %patch4 -p1 -b .backup %patch5 -p1 -b .backup +%patch6 -p1 -b .backup +%patch7 -p1 -b .backup # Remove local intl (already bundled in fedora) rm -rf intl/*.h @@ -454,6 +459,10 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From ecbc7507e88ca96cae56d7112cfc32bf6df93dbf Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 8 Jan 2023 14:57:01 +0100 Subject: [PATCH 053/104] Disable LTO flags --- giac-1.6.0-fix_micropy_compiler_flags.patch | 2 +- giac.spec | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/giac-1.6.0-fix_micropy_compiler_flags.patch b/giac-1.6.0-fix_micropy_compiler_flags.patch index b417a6b..49ddd33 100644 --- a/giac-1.6.0-fix_micropy_compiler_flags.patch +++ b/giac-1.6.0-fix_micropy_compiler_flags.patch @@ -24,7 +24,7 @@ COPT = -g else -COPT = -g #-fomit-frame-pointer -flto -+COPT = -g ++COPT = ${CFLAGS_FEDORA} endif # compiler settings diff --git a/giac.spec b/giac.spec index a296ea3..5065486 100644 --- a/giac.spec +++ b/giac.spec @@ -4,12 +4,14 @@ %bcond_without flexiblas +%global _lto_cflags %{nil} + %global subversion .29 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 2%{?dist} +Release: 3%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -226,14 +228,11 @@ export CFLAGS="%build_cflags" 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 -# Fix unused-direct-shlib-dependency with libgslcblas.so.0 and libgfortran.so.3 -sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool - # 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/') +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="%build_cflags" -export LDFLAGS_FEDORA="%build_ldflags" +export CFLAGS_FEDORA="$OPT_FLAGS" +export LDFLAGS_FEDORA="$OPT_FLAGS" %make_build V=1 # Rebuild giac_*.info and Convert info file to utf-8 @@ -459,6 +458,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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. From eff1cb66d39dd564a6b0f2bdf13a6c31ba944748 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Tue, 10 Jan 2023 18:24:20 +0100 Subject: [PATCH 054/104] Update to 1.9.0 sub-35 --- .gitignore | 1 + giac-makesrc.sh | 2 +- giac.spec | 12 ++++++++---- sources | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index bf6d6cf..c895b44 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /giac-1.7.0.29.tar.gz /giac-1.9.0.19.tar.gz /giac-1.9.0.29.tar.gz +/giac-1.9.0.35.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 751e640..5424dc5 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.9.0" -VERSIONREV="29" +VERSIONREV="35" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index 5065486..771cdc4 100644 --- a/giac.spec +++ b/giac.spec @@ -6,12 +6,12 @@ %global _lto_cflags %{nil} -%global subversion .29 +%global subversion .35 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 3%{?dist} +Release: 1%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -217,7 +217,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="%build_cflags" +export CFLAGS="$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 \ @@ -362,7 +362,8 @@ make -C check check %{_bindir}/giac %{_bindir}/hevea2mml %{_bindir}/*_help -%{_libdir}/libgiac.so.* +%{_libdir}/libgiac.so.0.0.0 +%{_libdir}/libgiac.so.0 %{_libdir}/libgiac.a %{_libdir}/libmicropython.a %{_libdir}/libxcas.a @@ -458,6 +459,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 diff --git a/sources b/sources index 89b7246..67bda3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.29.tar.gz) = 7e93dafa49aae5d15da5361eefaf761d0bfc70372e350436543685ff5c7ce5fb4ed648442652727f68e19a47392cf9f382e9769fdc79c8aeab27b117409cba29 +SHA512 (giac-1.9.0.35.tar.gz) = 5820bb7b962154ede0788bcca5e1bd13610cb45fc27488d3daa06b73164d462cd238569360552a9748e39c33ec75ca32c80ff5cf959b73e3ad8ea184f0424172 From 4ab793b16f2b72f9c3808b47e975743a197039cb Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Tue, 10 Jan 2023 18:43:43 +0100 Subject: [PATCH 055/104] Update to 1.9.0 sub-35| Obsolete patch 6 --- giac-alloca-c99.patch | 8 -------- giac.spec | 4 +--- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 giac-alloca-c99.patch diff --git a/giac-alloca-c99.patch b/giac-alloca-c99.patch deleted file mode 100644 index 804aeae..0000000 --- a/giac-alloca-c99.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- giac-1.9.0.orig/micropython-1.12/xcas/mpconfigport.h 2022-04-11 09:52:40.000000000 +0200 -+++ giac-1.9.0/micropython-1.12/xcas/mpconfigport.h 2022-12-07 10:30:22.434868459 +0100 -@@ -151,4 +151,4 @@ - { MP_ROM_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \ - { MP_ROM_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj }, - --/* #include */ -+#include diff --git a/giac.spec b/giac.spec index 771cdc4..791f862 100644 --- a/giac.spec +++ b/giac.spec @@ -41,8 +41,7 @@ Patch4: %{name}-fix_graphe_file.patch # Adapt to pari 2.15.0 Patch5: %{name}-pari2.15.patch -Patch6: %{name}-alloca-c99.patch -Patch7: %{name}-delete-fenv.patch +Patch6: %{name}-delete-fenv.patch BuildRequires: autoconf, libtool BuildRequires: python3-devel @@ -170,7 +169,6 @@ with Giac computations. %patch4 -p1 -b .backup %patch5 -p1 -b .backup %patch6 -p1 -b .backup -%patch7 -p1 -b .backup # Remove local intl (already bundled in fedora) rm -rf intl/*.h From 2b2960c0ab76f04e98fae10fb91a740443c655b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 04:49:24 +0000 Subject: [PATCH 056/104] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_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 791f862..cb041b6 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} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -457,6 +457,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 From 56dfbaef676a213455f17057b5cea02f4cd7148b Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 1 Feb 2023 21:19:31 +0100 Subject: [PATCH 057/104] Update to 1.9.0 sub-37 --- .gitignore | 1 + giac-makesrc.sh | 2 +- giac.spec | 7 +++++-- sources | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c895b44..bd75c5c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /giac-1.9.0.19.tar.gz /giac-1.9.0.29.tar.gz /giac-1.9.0.35.tar.gz +/giac-1.9.0.37.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 5424dc5..5187057 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.9.0" -VERSIONREV="35" +VERSIONREV="37" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index cb041b6..0aab5e9 100644 --- a/giac.spec +++ b/giac.spec @@ -6,12 +6,12 @@ %global _lto_cflags %{nil} -%global subversion .35 +%global subversion .37 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.9.0%{subversion} -Release: 2%{?dist} +Release: 1%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* # MIT: libmicropython.a @@ -457,6 +457,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 diff --git a/sources b/sources index 67bda3f..5cfd8fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.35.tar.gz) = 5820bb7b962154ede0788bcca5e1bd13610cb45fc27488d3daa06b73164d462cd238569360552a9748e39c33ec75ca32c80ff5cf959b73e3ad8ea184f0424172 +SHA512 (giac-1.9.0.37.tar.gz) = 1d20c3ae150a5c7b38b42117542580a329a118b52bf0ec138cde20c75446d5c9a43e1e82c75dcf3130f301838107fb83d4683d6936614da1e10d1e22be1877e5 From 5fb158b757701c2dc6a7c74d5f9b2bf826ef5e33 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 29 Jun 2023 19:29:19 +0200 Subject: [PATCH 058/104] Update to 1.9.0 sub-57 --- .gitignore | 1 + giac-makesrc.sh | 2 +- giac.spec | 19 +++++++++++-------- sources | 2 +- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index bd75c5c..2683467 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /giac-1.9.0.29.tar.gz /giac-1.9.0.35.tar.gz /giac-1.9.0.37.tar.gz +/giac-1.9.0.57.tar.gz diff --git a/giac-makesrc.sh b/giac-makesrc.sh index 5187057..b86fa63 100755 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.9.0" -VERSIONREV="37" +VERSIONREV="57" # The upstream tarball name is: giac"$SOURCEORIG".tar.gz SOURCEORIG=_"$VERSION"-"$VERSIONREV" diff --git a/giac.spec b/giac.spec index 0aab5e9..be0823d 100644 --- a/giac.spec +++ b/giac.spec @@ -6,7 +6,7 @@ %global _lto_cflags %{nil} -%global subversion .37 +%global subversion .57 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry @@ -162,13 +162,13 @@ with Giac computations. %prep %autosetup -p0 -n %{name}-%{majver} -N -%patch0 -p1 -b .backup -%patch1 -p1 -b .backup -%patch2 -p0 -b .backup -%patch3 -p0 -b .backup -%patch4 -p1 -b .backup -%patch5 -p1 -b .backup -%patch6 -p1 -b .backup +%patch -P 0 -p1 -b .backup +%patch -P 1 -p1 -b .backup +%patch -P 2 -p0 -b .backup +%patch -P 3 -p0 -b .backup +%patch -P 4 -p1 -b .backup +%patch -P 5 -p1 -b .backup +%patch -P 6 -p1 -b .backup # Remove local intl (already bundled in fedora) rm -rf intl/*.h @@ -457,6 +457,9 @@ make -C check check %{_datadir}/giac/examples/ %changelog +* 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 diff --git a/sources b/sources index 5cfd8fa..b04bbea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (giac-1.9.0.37.tar.gz) = 1d20c3ae150a5c7b38b42117542580a329a118b52bf0ec138cde20c75446d5c9a43e1e82c75dcf3130f301838107fb83d4683d6936614da1e10d1e22be1877e5 +SHA512 (giac-1.9.0.57.tar.gz) = b429a2e8bba9564359a552080f5155ba6dd5dc4f075bd7f9850c6637494b68cedce4794f2ce3734fd50848aad202688101ef32031aaec4fe0815ada6fd5cadd0 From 91c556de27a32b3bb64fd12f08823d0b956bb1c0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 13 Jul 2023 13:30:38 -0600 Subject: [PATCH 059/104] 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 060/104] 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 061/104] 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 062/104] 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 063/104] 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 064/104] 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 065/104] 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 066/104] 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 067/104] 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 068/104] 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 069/104] 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 070/104] 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 071/104] 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 072/104] 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 073/104] 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 074/104] 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 075/104] 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 076/104] 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 077/104] 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 078/104] 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 079/104] 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 080/104] 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 081/104] 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 082/104] 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 083/104] 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 084/104] 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 085/104] 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 086/104] 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 087/104] 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 088/104] 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 089/104] 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 090/104] 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 091/104] 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 092/104] 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 093/104] 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 094/104] 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 095/104] 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 096/104] 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 097/104] 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 098/104] 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 099/104] 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 100/104] 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 101/104] 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 102/104] 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 103/104] 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 104/104] Rebuild for nauty 2.9.3