diff --git a/.gitignore b/.gitignore index b683447..7855ff2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /giac-1.2.2.63.tar.gz /giac-1.2.2.75.tar.gz +/giac-1.2.2.85.tar.gz diff --git a/giac-cSolveorder-check.patch b/giac-cSolveorder-check.patch deleted file mode 100644 index 368aec6..0000000 --- a/giac-cSolveorder-check.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- check/TP16-sol.cas.out1 2016-03-04 16:45:42.000000000 +0100 -+++ check/TP16-sol.cas.out1 2016-03-24 17:58:52.913308919 +0100 -@@ -48,7 +48,7 @@ - "Done", - [-sqrt(13)-1,sqrt(13)-1,4], - y^2+6*sqrt(13)+18,y^2-6*sqrt(13)+18,y^2, ---sqrt(6)*I*sqrt(sqrt(13)+3),sqrt(6)*I*sqrt(sqrt(13)+3),-sqrt(6)*sqrt(sqrt(13)-3),sqrt(6)*sqrt(sqrt(13)-3),0, -+sqrt(6)*I*sqrt(sqrt(13)+3),-sqrt(6)*I*sqrt(sqrt(13)+3),-sqrt(6)*sqrt(sqrt(13)-3),sqrt(6)*sqrt(sqrt(13)-3),0, - "No such variable u", - x^2+1/4*y^2+1/9*z^2-1, - x^2+y^2+z^2-u, diff --git a/giac-makesrc.sh b/giac-makesrc.sh old mode 100755 new mode 100744 index c2cb4df..cf370d3 --- a/giac-makesrc.sh +++ b/giac-makesrc.sh @@ -5,7 +5,7 @@ # VERSION="1.2.2" -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 9d649ac..5bb501b 100644 --- a/giac.spec +++ b/giac.spec @@ -2,12 +2,16 @@ # http://xcas.e.ujf-grenoble.fr/XCAS/viewtopic.php?f=19&t=1723 ExcludeArch: aarch64 ppc64 ppc64le s390x -%global subversion 75 +# Tests excluded +# See http://pcm1.e.ujf-grenoble.fr/forum/viewtopic.php?f=19&t=1733&sid=3257f5085f4ae208dc36665f2873252f +%bcond_with check + +%global subversion 85 Name: giac Summary: Computer Algebra System, Symbolic calculus, Geometry Version: 1.2.2 -Release: 9.%{subversion}%{?dist} +Release: 10.%{subversion}%{?dist} # LGPLv3+: src/Fl_GDI_Printer.cxx, src/Flv_List.cc, src/Flv_Table.cc # BSD: src/tinymt32* License: GPLv3+ @@ -18,10 +22,7 @@ URL: http://www-fourier.ujf-grenoble.fr/~parisse/giac.html ## and re-package without non-free FR documentation by giac-makesrc script. Source0: %{name}-%{version}.%{subversion}.tar.gz Source1: %{name}-makesrc.sh -Source2: xcas-appdata.xml - -# Fix cSolveorder check -Patch0: %{name}-cSolveorder-check.patch +Source2: xcas.appdata.xml BuildRequires: readline-devel BuildRequires: gettext-devel @@ -118,7 +119,6 @@ with Giac computations. %prep %setup -q -%patch0 -p0 # Remove local intl (already bundled in fedora) rm -rf intl/*.h @@ -297,9 +297,11 @@ fi /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +%if %{with check} %check export LD_LIBRARY_PATH=../src/.libs make -C check check +%endif %files -f %{name}.lang %license COPYING @@ -400,10 +402,13 @@ make -C check check %{_datadir}/giac/examples/ %changelog -* Mon Sep 5 2016 Jerry James 1.2.2-9.75 +* 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 +* 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 diff --git a/sources b/sources index e5c609f..d0486a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd38984b21f54c59f9e55014f9dbd026 giac-1.2.2.75.tar.gz +e20323ea5ec8380f2bd2ebd89188b3f6 giac-1.2.2.85.tar.gz 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 - diff --git a/xcas.appdata.xml b/xcas.appdata.xml new file mode 100644 index 0000000..29740af --- /dev/null +++ b/xcas.appdata.xml @@ -0,0 +1,57 @@ + + + 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 +