From fd136f3a95dcb26e10f9f8e159c2904293681b7e Mon Sep 17 00:00:00 2001 From: Frantisek Kluknavsky Date: Wed, 25 Nov 2015 16:47:51 +0100 Subject: [PATCH] rebase to 6.1.0 - gmp-6.0.0-ppc64.patch already upstream, dropped --- .gitignore | 1 + gmp-6.0.0-ppc64.patch | 13 ------------- gmp.spec | 12 +++++++----- sources | 2 +- 4 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 gmp-6.0.0-ppc64.patch diff --git a/.gitignore b/.gitignore index fd49525..91fb1eb 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /gmp-5.1.2.tar.bz2 /gmp-5.1.3.tar.bz2 /gmp-6.0.0a.tar.bz2 +/gmp-6.1.0.tar.bz2 diff --git a/gmp-6.0.0-ppc64.patch b/gmp-6.0.0-ppc64.patch deleted file mode 100644 index 3a24567..0000000 --- a/gmp-6.0.0-ppc64.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up gmp-6.0.0/mpn/powerpc64/mode64/gcd_1.asm.rh1 gmp-6.0.0/mpn/powerpc64/mode64/gcd_1.asm ---- gmp-6.0.0/mpn/powerpc64/mode64/gcd_1.asm.rh1 2014-04-24 17:44:56.282296502 +0200 -+++ gmp-6.0.0/mpn/powerpc64/mode64/gcd_1.asm 2014-04-24 17:46:07.291786670 +0200 -@@ -43,6 +43,9 @@ define(`up', `r3') - define(`n', `r4') - define(`v0', `r5') - -+ifdef(`BMOD_1_TO_MOD_1_THRESHOLD',, -+ `define(`BMOD_1_TO_MOD_1_THRESHOLD',30)') -+ - EXTERN_FUNC(mpn_mod_1) - EXTERN_FUNC(mpn_modexact_1c_odd) - diff --git a/gmp.spec b/gmp.spec index c105861..1ee5c1f 100644 --- a/gmp.spec +++ b/gmp.spec @@ -5,15 +5,14 @@ Summary: A GNU arbitrary precision library Name: gmp -Version: 6.0.0 -Release: 14%{?dist} +Version: 6.1.0 +Release: 1%{?dist} Epoch: 1 URL: http://gmplib.org/ -Source0: ftp://ftp.gmplib.org/pub/gmp-%{version}/gmp-%{version}a.tar.bz2 +Source0: ftp://ftp.gmplib.org/pub/gmp-%{version}/gmp-%{version}.tar.bz2 # or ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.xz Source2: gmp.h Source3: gmp-mparam.h -Patch1: gmp-6.0.0-ppc64.patch Patch2: gmp-6.0.0-debuginfo.patch License: LGPLv3+ or GPLv2+ Group: System Environment/Libraries @@ -60,7 +59,6 @@ in applications. %prep %setup -q -%patch1 -p1 -b .ppc64 %patch2 -p1 -b .debuginfo # switch the defaults to new cpus on s390x @@ -237,6 +235,10 @@ exit 0 %{_libdir}/libgmpxx.a %changelog +* Wed Nov 25 2015 Frantisek Kluknavsky - 1:6.1.0-1 +- rebase to 6.1.0 +- gmp-6.0.0-ppc64.patch already upstream, dropped + * Mon Sep 14 2015 Frantisek Kluknavsky - 1:6.0.0-13 - do not package sse2 variant, use --enable-fat instead (a bit dangerous, some low level routines will be skipped in `make check`) diff --git a/sources b/sources index 8ba8db8..0cb055f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7ff2d88cae7f8085bd5006096eed470 gmp-6.0.0a.tar.bz2 +86ee6e54ebfc4a90b643a65e402c4048 gmp-6.1.0.tar.bz2