From d4c3d5b639a450cdc945b92e99818406aab36055 Mon Sep 17 00:00:00 2001 From: Frantisek Kluknavsky Date: Fri, 25 Jan 2013 13:00:54 +0100 Subject: [PATCH] rebase to 5.1.0, de-ansi patch no longer applicable --- gmp-5.0.5-de-ansi-fication.patch | 34 -------------------------------- gmp.spec | 4 +--- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 gmp-5.0.5-de-ansi-fication.patch diff --git a/gmp-5.0.5-de-ansi-fication.patch b/gmp-5.0.5-de-ansi-fication.patch deleted file mode 100644 index 4996578..0000000 --- a/gmp-5.0.5-de-ansi-fication.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -upr gmp-5.0.5.orig/configure.in gmp-5.0.5/configure.in ---- gmp-5.0.5.orig/configure.in 2012-07-20 16:15:11.080198639 +0200 -+++ gmp-5.0.5/configure.in 2012-07-20 16:16:27.000529431 +0200 -@@ -65,7 +65,7 @@ dnl - dnl Note that there's a copy of these options in the top-level Makefile.am, - dnl so update there too if changing anything. - dnl --AM_INIT_AUTOMAKE([1.8 gnu no-dependencies $(top_builddir)/ansi2knr]) -+AM_INIT_AUTOMAKE([1.8 gnu no-dependencies]) - AM_CONFIG_HEADER(config.h:config.in) - AM_MAINTAINER_MODE - -@@ -2232,9 +2232,6 @@ fi - echo " MPN_PATH=\"$path\"" - - --# Automake ansi2knr support. --AM_C_PROTOTYPES -- - CL_AS_NOEXECSTACK - - GMP_PROG_AR -diff -upr gmp-5.0.5.orig/Makefile.am gmp-5.0.5/Makefile.am ---- gmp-5.0.5.orig/Makefile.am 2012-05-06 13:19:49.000000000 +0200 -+++ gmp-5.0.5/Makefile.am 2012-07-20 16:17:06.050983848 +0200 -@@ -25,7 +25,7 @@ - # Makefiles in subdirectories, but here we must omit it so automake gives - # the actual ansi2knr build rule, not "cd $(top_builddir) && make ansi2knr". - # --AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr -+AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies - - - # Libtool -version-info for libgmp.la and libmp.la. See "Versioning" in the diff --git a/gmp.spec b/gmp.spec index 79256b8..894a625 100644 --- a/gmp.spec +++ b/gmp.spec @@ -14,7 +14,6 @@ Source0: ftp://ftp.gmplib.org/pub/gmp-%{version}/gmp-%{version}.tar.bz2 Source2: gmp.h Source3: gmp-mparam.h Patch0: gmp-4.0.1-s390.patch -Patch1: gmp-5.0.5-de-ansi-fication.patch License: LGPLv3+ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,7 +58,6 @@ in applications. %prep %setup -q %patch0 -p1 -b .s390 -%patch1 -p1 -b .de-ansi %build autoreconf -if @@ -236,7 +234,7 @@ exit 0 %changelog * Fri Jan 25 2013 Frantisek Kluknavsky - 1:5.1.0-1 -- rebase to 5.1.0 +- rebase to 5.1.0, de-ansi patch no longer applicable * Tue Jan 22 2013 Peter Robinson 1:5.0.5-6 - Rebuild against new binutils to fix FTBFS on ARM