From b3664a6daa8bfea79c5f807d22e43326a87d235b Mon Sep 17 00:00:00 2001 From: Ivana Hutarova Varekova Date: Wed, 24 Nov 2010 14:41:26 +0100 Subject: [PATCH] - downgrade from 5.0.1 to 4.3.2 --- .gitignore | 2 +- gmp-4.0.1-s390.patch | 59 ++++++++++++++++++++++++++++++++++++++++++++ gmp-5.0.1-s390.patch | 28 --------------------- gmp.spec | 14 ++++++----- sources | 2 +- 5 files changed, 69 insertions(+), 36 deletions(-) create mode 100644 gmp-4.0.1-s390.patch delete mode 100644 gmp-5.0.1-s390.patch diff --git a/.gitignore b/.gitignore index 971d549..7a9e3c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gmp-5.0.1.tar.bz2 +/gmp-4.3.2.tar.bz2 diff --git a/gmp-4.0.1-s390.patch b/gmp-4.0.1-s390.patch new file mode 100644 index 0000000..c7afefc --- /dev/null +++ b/gmp-4.0.1-s390.patch @@ -0,0 +1,59 @@ +diff -up gmp-4.3.1/configure.in.s390 gmp-4.3.1/configure.in +--- gmp-4.3.1/configure.in.s390 2009-05-12 08:12:12.000000000 +0200 ++++ gmp-4.3.1/configure.in 2009-05-28 14:59:54.000000000 +0200 +@@ -1066,6 +1066,11 @@ case $host in + ;; + + ++ s390x-*-*) ++ gcc_cflags="-g -O2 $fomit_frame_pointer" ++ path="s390x" ++ #extra_functions="udiv_w_sdiv" ++ ;; + # IBM s/370 and similar + [s3[6-9]0*-*-*]) + gcc_cflags="$gcc_cflags $fomit_frame_pointer" +diff -up gmp-4.3.1/mpn/s390/gmp-mparam.h.s390 gmp-4.3.1/mpn/s390/gmp-mparam.h +--- gmp-4.3.1/mpn/s390/gmp-mparam.h.s390 2009-05-12 08:12:12.000000000 +0200 ++++ gmp-4.3.1/mpn/s390/gmp-mparam.h 2009-05-28 14:59:54.000000000 +0200 +@@ -18,7 +18,8 @@ You should have received a copy of the G + along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ + + +-/* BITS_PER_MP_LIMB etc generated by configure */ ++#define BITS_PER_MP_LIMB 32 ++#define BYTES_PER_MP_LIMB 4 + + + /* Generated by tuneup.c, 2001-12-03, gcc 2.95 */ +diff -up /dev/null gmp-4.3.1/mpn/s390x/gmp-mparam.h +--- /dev/null 2009-05-25 10:38:12.683001420 +0200 ++++ gmp-4.3.1/mpn/s390x/gmp-mparam.h 2009-05-28 14:59:54.000000000 +0200 +@@ -0,0 +1,27 @@ ++/* gmp-mparam.h -- Compiler/machine parameter header file. ++ ++Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation, Inc. ++ ++This file is part of the GNU MP Library. ++ ++The GNU MP Library is free software; you can redistribute it and/or modify ++it under the terms of the GNU Library General Public License as published by ++the Free Software Foundation; either version 2 of the License, or (at your ++option) any later version. ++ ++The GNU MP Library is distributed in the hope that it will be useful, but ++WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ++or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public ++License for more details. ++ ++You should have received a copy of the GNU Library General Public License ++along with the GNU MP Library; see the file COPYING.LIB. If not, write to ++the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ++MA 02111-1307, USA. */ ++ ++#define BITS_PER_MP_LIMB 64 ++#define BYTES_PER_MP_LIMB 8 ++#define BITS_PER_LONGINT 64 ++#define BITS_PER_INT 32 ++#define BITS_PER_SHORTINT 16 ++#define BITS_PER_CHAR 8 diff --git a/gmp-5.0.1-s390.patch b/gmp-5.0.1-s390.patch deleted file mode 100644 index c8864d3..0000000 --- a/gmp-5.0.1-s390.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up gmp-5.0.1/configure.in.pom gmp-5.0.1/configure.in ---- gmp-5.0.1/configure.in.pom 2010-02-06 13:43:13.000000000 +0100 -+++ gmp-5.0.1/configure.in 2010-05-24 13:36:37.000000000 +0200 -@@ -1095,6 +1095,11 @@ case $host in - ;; - - -+ s390x-*-*) -+ gcc_cflags="-g -O2 $fomit_frame_pointer" -+ path="s390x" -+ #extra_functions="udiv_w_sdiv" -+ ;; - # IBM s/370 and similar - [s3[6-9]0*-*-*]) - gcc_cflags="$gcc_cflags $fomit_frame_pointer" -diff -up gmp-5.0.1/mpn/s390/gmp-mparam.h.pom gmp-5.0.1/mpn/s390/gmp-mparam.h ---- gmp-5.0.1/mpn/s390/gmp-mparam.h.pom 2010-02-06 13:43:14.000000000 +0100 -+++ gmp-5.0.1/mpn/s390/gmp-mparam.h 2010-05-24 13:39:21.000000000 +0200 -@@ -18,7 +18,8 @@ You should have received a copy of the G - along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */ - - --/* GMP_LIMB_BITS etc generated by configure */ -+#define BITS_PER_MP_LIMB 32 -+#define BYTES_PER_MP_LIMB 4 - - - /* Generated by tuneup.c, 2001-12-03, gcc 2.95 */ diff --git a/gmp.spec b/gmp.spec index 064f17f..4985a96 100644 --- a/gmp.spec +++ b/gmp.spec @@ -5,16 +5,15 @@ Summary: A GNU arbitrary precision library Name: gmp -Version: 5.0.1 +Version: 4.3.2 Release: 1%{?dist} +Epoch: 1 URL: http://gmplib.org/ Source0: ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.bz2 Source2: gmp.h Source3: gmp-mparam.h -Patch0: gmp-5.0.1-s390.patch -# mpn/s390x/gmp-mparam.h: LGPLv2+ -# demos/calc/calc.c: GPLv3+ -License: LGPLv2+ and GPLv3+ and LGPLv3+ +Patch0: gmp-4.0.1-s390.patch +License: LGPLv3+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf automake libtool @@ -56,7 +55,7 @@ The static libraries for using the GNU MP arbitrary precision library in applications. %prep -%setup -q +%setup -q %patch0 -p1 -b .s390 %build @@ -228,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Nov 24 2010 Ivana Hutarova Varekova 1:4.3.2-1 +- downgrade from 5.0.1 to 4.3.2 + * Mon May 24 2010 Ivana Hutarova Varekova 5.0.1-1 - update to 5.0.1 diff --git a/sources b/sources index de0e856..fe61cd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6bac6df75c192a13419dfd71d19240a7 gmp-5.0.1.tar.bz2 +dd60683d7057917e34630b4a787932e8 gmp-4.3.2.tar.bz2