From b04743658fe40648114baa2cfeb7f974cc55cf40 Mon Sep 17 00:00:00 2001 From: Frantisek Kluknavsky Date: Thu, 14 Feb 2013 16:57:16 +0100 Subject: [PATCH] rebase to 5.1.1 - deleted unapplicable part of gmp-4.0.1-s390.patch --- gmp-4.0.1-s390.patch | 18 ++---------------- gmp.spec | 10 +++++----- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/gmp-4.0.1-s390.patch b/gmp-4.0.1-s390.patch index 4eed537..a446cc3 100644 --- a/gmp-4.0.1-s390.patch +++ b/gmp-4.0.1-s390.patch @@ -1,20 +1,6 @@ -diff -up gmp-5.0.4/configure.in.s390 gmp-5.0.4/configure.in ---- gmp-5.0.4/configure.in.s390 2012-02-10 11:23:05.000000000 +0100 -+++ gmp-5.0.4/configure.in 2012-04-18 12:49:59.681014202 +0200 -@@ -1097,6 +1097,10 @@ case $host in - path="pyr" - ;; - -+ s390x-*-*) -+ gcc_cflags="-g -O2 $fomit_frame_pointer" -+ path="s390x" -+ ;; - - # IBM System/390 and z/Architecture - S390_PATTERN | S390X_PATTERN) diff -up gmp-5.0.4/mpn/s390x/gmp-mparam.h.s390 gmp-5.0.4/mpn/s390x/gmp-mparam.h ---- gmp-5.0.4/mpn/s390x/gmp-mparam.h.s390 2012-04-18 12:44:04.482509106 +0200 -+++ gmp-5.0.4/mpn/s390x/gmp-mparam.h 2012-04-18 12:44:04.482509106 +0200 +--- gmp-5.0.4/mpn/s390-64/gmp-mparam.h.s390 2012-04-18 12:44:04.482509106 +0200 ++++ gmp-5.0.4/mpn/s390-64/gmp-mparam.h 2012-04-18 12:44:04.482509106 +0200 @@ -0,0 +1,26 @@ +/* gmp-mparam.h -- Compiler/machine parameter header file. + diff --git a/gmp.spec b/gmp.spec index 3a64c89..e3aa5ff 100644 --- a/gmp.spec +++ b/gmp.spec @@ -6,14 +6,14 @@ Summary: A GNU arbitrary precision library Name: gmp Version: 5.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 URL: http://gmplib.org/ 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 -#No longer applicable Patch0: gmp-4.0.1-s390.patch +Patch0: gmp-4.0.1-s390.patch License: LGPLv3+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -57,7 +57,7 @@ in applications. %prep %setup -q -#no longer applicable % patch0 -p1 -b .s390 +%patch0 -p1 -b .s390 %build autoreconf -if @@ -227,9 +227,9 @@ exit 0 %changelog -* Thu Feb 14 2013 Frantisek Kluknavsky - 1:5.1.1-1 +* Thu Feb 14 2013 Frantisek Kluknavsky - 1:5.1.1-2 - rebase to 5.1.1 -- dropped unapplicable gmp-4.0.1-s390.patch +- deleted unapplicable part of gmp-4.0.1-s390.patch * Fri Jan 25 2013 Frantisek Kluknavsky - 1:5.1.0-1 - rebase to 5.1.0, de-ansi patch no longer applicable