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