resolves: #702919

update to 5.0.2 resolves: #738091 removed unused direct shlib dependency on libm updated license in gmp.h and gmp-mparam.h files
2011-09-20 10:18:47 +02:00 · 2011-09-20 10:18:47 +02:00 · de470d2d4d
commit de470d2d4d
parent 21ef78ee0e
6 changed files with 45 additions and 37 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-/gmp-4.3.2.tar.bz2
+/gmp-5.0.2.tar.bz2
--- a/gmp-4.0.1-s390.patch
+++ b/gmp-4.0.1-s390.patch
@ -1,26 +1,25 @@
-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
+diff -up gmp-5.0.2/configure.in.tmp gmp-5.0.2/configure.in
+--- gmp-5.0.2/configure.in.tmp	2011-05-08 11:49:29.000000000 +0200
+++ gmp-5.0.2/configure.in	2011-08-15 14:34:22.543596916 +0200
+@@ -1109,6 +1109,10 @@ case $host in
+     path="pyr"
     ;;
 
- 
 +  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
+diff -up gmp-5.0.2/mpn/s390/gmp-mparam.h.tmp gmp-5.0.2/mpn/s390/gmp-mparam.h
+--- gmp-5.0.2/mpn/s390/gmp-mparam.h.tmp	2011-08-15 14:37:48.000000000 +0200
+++ gmp-5.0.2/mpn/s390/gmp-mparam.h	2011-08-15 14:38:22.884229091 +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 */
+-/* GMP_LIMB_BITS etc generated by configure */
 +#define BITS_PER_MP_LIMB 32
 +#define BYTES_PER_MP_LIMB 4
 
@ -29,27 +28,26 @@ diff -up gmp-4.3.1/mpn/s390/gmp-mparam.h.s390 gmp-4.3.1/mpn/s390/gmp-mparam.h
 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 @@
+@@ -0,0 +1,26 @@
 +/* gmp-mparam.h -- Compiler/machine parameter header file.
 +
-+Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation, Inc.
+Copyright 1991, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
+2004, 2005, 2006, 2007, 2008, 2009 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
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 3 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
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser 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. */
+You should have received a copy of the GNU Lesser General Public License
+along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 +
 +#define BITS_PER_MP_LIMB 64
 +#define BYTES_PER_MP_LIMB 8
--- a/gmp-mparam.h
+++ b/gmp-mparam.h
@ -1,12 +1,13 @@
 /* Generic x86 gmp-mparam.h -- Compiler/machine parameter header file.

-Copyright 1991, 1993, 1994, 2000, 2001, 2002 Free Software Foundation, Inc.
+Copyright 1991, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
+2004, 2005, 2006, 2007, 2008, 2009 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 Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or (at your
+the Free Software Foundation; either version 3 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
@ -15,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 License for more details.

 You should have received a copy of the GNU Lesser 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. */
+along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */

 /*
 * This gmp-mparam.h is a wrapper include file for the original gmp-mparam.h, 
--- a/gmp.h
+++ b/gmp.h
@ -1,13 +1,13 @@
 /* Definitions for GNU multiple precision functions.   -*- mode: c -*-

 Copyright 1991, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-2004 Free Software Foundation, Inc.
+2004, 2005, 2006, 2007, 2008, 2009 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 Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or (at your
+the Free Software Foundation; either version 3 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
@ -16,9 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 License for more details.

 You should have received a copy of the GNU Lesser 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. */
+along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */

 /*
 * This gmp.h is a wrapper include file for the original gmp.h, which has been
--- a/gmp.spec
+++ b/gmp.spec
@ -1,12 +1,12 @@
 #
-# Important for %{ix86}:
+# Important for %%{ix86}:
 # This rpm has to be build on a CPU with sse2 support like Pentium 4 !
 #

 Summary: A GNU arbitrary precision library
 Name: gmp
-Version: 4.3.2
-Release: 4%{?dist}
+Version: 5.0.2
+Release: 1%{?dist}
 Epoch: 1
 URL: http://gmplib.org/
 Source0: ftp://ftp.gnu.org/pub/gnu/gmp/gmp-%{version}.tar.bz2
@ -83,7 +83,10 @@ ln -s ../configure .
         --mandir=%{_mandir} \
         --infodir=%{_infodir} \
         --enable-mpbsd --enable-cxx
-perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
+sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+    -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
+    -e 's|-lstdc++ -lm|-lstdc++|' \
+    -i libtool
 export LD_LIBRARY_PATH=`pwd`/.libs
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 cd ..
@ -108,7 +111,10 @@ CFLAGS="$RPM_OPT_FLAGS -march=pentium4"
         --mandir=%{_mandir} \
         --infodir=%{_infodir} \
         --enable-mpbsd --enable-cxx
-perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
+sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+    -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
+    -e 's|-lstdc++ -lm|-lstdc++|' \
+    -i libtool
 export LD_LIBRARY_PATH=`pwd`/.libs
 make CFLAGS="$RPM_OPT_FLAGS -march=pentium4" %{?_smp_mflags}
 unset CFLAGS
@ -227,6 +233,13 @@ rm -rf $RPM_BUILD_ROOT


 %changelog
+* Tue Sep 20 2011 Peter Schiffer <pschiffe@redhat.com> 1:5.0.2-1
+- resolves: #702919
+  update to 5.0.2
+- resolves: #738091
+  removed unused direct shlib dependency on libm
+  updated license in gmp.h and gmp-mparam.h files
+
 * Mon Jun 13 2011 Ivana Hutarova Varekova <varekova@redhat.com> 1:4.3.2-4
 - Resolves: #706374
  fix sse2/libgmp.so.3.5.2 debuginfo data
--- a/2
+++ b/2
@ -1 +1 @@
-dd60683d7057917e34630b4a787932e8  gmp-4.3.2.tar.bz2
+0bbaedc82fb30315b06b1588b9077cd3  gmp-5.0.2.tar.bz2