diff --git a/sagemath-mpfr.patch b/sagemath-mpfr.patch deleted file mode 100644 index 3e68b83..0000000 --- a/sagemath-mpfr.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up src/sage/libs/mpfr/__init__.pxd.orig src/sage/libs/mpfr/__init__.pxd ---- src/sage/libs/mpfr/__init__.pxd.orig 2018-12-22 16:37:08.000000000 -0700 -+++ src/sage/libs/mpfr/__init__.pxd 2019-01-04 11:10:25.215172876 -0700 -@@ -96,7 +96,6 @@ cdef extern from "mpfr.h": - int mpfr_sqrt(mpfr_t rop, mpfr_t op, mpfr_rnd_t rnd) - int mpfr_sqrt_ui(mpfr_t rop, unsigned long int op, mpfr_rnd_t rnd) - int mpfr_cbrt(mpfr_t rop, mpfr_t op, mpfr_rnd_t rnd) -- int mpfr_rootn_ui(mpfr_t rop, mpfr_t op, unsigned long int k, mpfr_rnd_t rnd) - int mpfr_root(mpfr_t rop, mpfr_t op, unsigned long int k, mpfr_rnd_t rnd) - int mpfr_pow(mpfr_t rop, mpfr_t op1, mpfr_t op2, mpfr_rnd_t rnd) - int mpfr_pow_ui(mpfr_t rop, mpfr_t op1, unsigned long int op2, mpfr_rnd_t rnd) -diff -up src/sage/rings/complex_mpc.pyx.orig src/sage/rings/complex_mpc.pyx ---- src/sage/rings/complex_mpc.pyx.orig 2018-12-22 16:37:09.000000000 -0700 -+++ src/sage/rings/complex_mpc.pyx 2019-01-04 11:10:25.217172839 -0700 -@@ -2203,7 +2203,7 @@ cdef class MPComplexNumber(sage.structur - cdef RealNumber a,r - a = self.argument()/n - r = self.abs() -- mpfr_rootn_ui(r.value, r.value, n, rrnd) -+ mpfr_root(r.value, r.value, n, rrnd) - - cdef MPComplexNumber z - z = self._new() -diff -up src/sage/rings/complex_number.pyx.orig src/sage/rings/complex_number.pyx ---- src/sage/rings/complex_number.pyx.orig 2018-12-22 16:37:09.000000000 -0700 -+++ src/sage/rings/complex_number.pyx 2019-01-04 11:10:25.218172820 -0700 -@@ -2265,7 +2265,7 @@ cdef class ComplexNumber(sage.structure. - rho = abs(self) - arg = self.argument() / n - mpfr_init2(r, self._prec) -- mpfr_rootn_ui(r, rho.value, n, rnd) -+ mpfr_root(r, rho.value, n, rnd) - - mpfr_sin_cos(z.__im, z.__re, arg.value, rnd) - mpfr_mul(z.__re, z.__re, r, rnd) -diff -up src/sage/rings/real_mpfr.pyx.orig src/sage/rings/real_mpfr.pyx ---- src/sage/rings/real_mpfr.pyx.orig 2019-01-04 12:22:18.194171036 -0700 -+++ src/sage/rings/real_mpfr.pyx 2019-01-16 09:46:36.794780751 -0700 -@@ -5386,7 +5386,7 @@ cdef class RealNumber(sage.structure.ele - if algorithm == 1: - x = self._new() - sig_on() -- mpfr_rootn_ui(x.value, self.value, n, (self._parent).rnd) -+ mpfr_root(x.value, self.value, n, (self._parent).rnd) - sig_off() - return x - diff --git a/sagemath.spec b/sagemath.spec index 7037fc6..82df99e 100644 --- a/sagemath.spec +++ b/sagemath.spec @@ -95,7 +95,7 @@ Name: sagemath Summary: A free open-source mathematics software system Version: 8.8 -Release: 6%{?dist} +Release: 7%{?dist} # The file ${SAGE_ROOT}/COPYING.txt is the upstream license breakdown file # Additionally, every $files section has a comment with the license name # before files with that license @@ -178,9 +178,6 @@ Patch19: %{name}-fes.patch # https://bugzilla.redhat.com/show_bug.cgi?id=974769 Patch20: %{name}-sympy.patch -# Adapt to MPFR 3.x. Remove this once Fedora updates to MPFR 4.x. -Patch21: %{name}-mpfr.patch - # Correct unable to start QEPCAD within sage # https://bugzilla.redhat.com/show_bug.cgi?id=1243590 Patch22: %{name}-qepcad.patch @@ -911,7 +908,6 @@ popd %endif %patch20 -%patch21 %patch22 %patch23 %patch24 @@ -1933,6 +1929,10 @@ rm -fr %{SAGE_LOCAL}/var/lib/sage/installed/database_cremona_ellcurve-%{cremona_ ######################################################################## %changelog +* Fri Oct 11 2019 Jerry James - 8.8-7 +- Rebuild for mpfr 4 +- Drop -mpfr patch + * Thu Sep 26 2019 Jerry James - 8.8-6 - Rebuild for ntl 11.4.0 - Add primecount support, including the -primecount patch