From 2dbdf19ea3891403932437254c5ba569041ac8ac Mon Sep 17 00:00:00 2001
From: Jerry James <jamesjer@betterlinux.com>
Date: Oct 04 2012 15:48:52 +0000
Subject: New upstream release.

Link with -lrt to get the clock_* functions.
Convince libtool to use -Wl,--as-needed appropriately.

---

diff --git a/.gitignore b/.gitignore
index 101c405..24f9872 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/mpir-2.5.1.tar.bz2
+/mpir-2.5.2.tar.bz2
diff --git a/mpir.spec b/mpir.spec
index 8aac1cb..7400c4e 100644
--- a/mpir.spec
+++ b/mpir.spec
@@ -1,5 +1,5 @@
 Name:			mpir
-Version:		2.5.1
+Version:		2.5.2
 Release:		1%{?dist}
 Summary:		A library for arbitrary precision arithmetic
 
@@ -43,12 +43,10 @@ for fil in doc/devel/*.txt doc/devel/configuration doc/isa_abi_headache; do
   mv -f $fil.conv $fil
 done
 
-# Fix an include reference
-sed -i 's/gmp\.h/mpir.h/' mpn/generic/redc_2.c
-
 %build
 %configure --disable-static --enable-cxx \
   CCAS="gcc -c -Wa,--noexecstack" \
+  LIBS="-lrt" \
   LDFLAGS="$RPM_LD_FLAGS -Wl,-z,noexecstack"
 
 # Remove YASM, just use the system yasm
@@ -59,12 +57,17 @@ all install check:
 	/bin/true
 EOT
 
-# Remove the RPATH
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-
-export LD_LIBRARY_PATH=`pwd`/.libs
+# Get rid of undesirable hardcoded rpaths; workaround libtool reordering
+# -Wl,--as-needed after all the libraries; also fix a typo.
+sed -e 's/func_apped/func_append/' \
+    -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|^LTCC="gcc"|LTCC="gcc -Wl,--as-needed"|' \
+    -e 's|^CC="g++"|CC="g++ -Wl,--as-needed"|' \
+    -i libtool
 
 # Compile
+export LD_LIBRARY_PATH=`pwd`/.libs
 make %{?_smp_mflags}
 
 %install
@@ -100,6 +103,11 @@ fi
 %{_infodir}/mpir.info*
 
 %changelog
+* Thu Oct  4 2012 Jerry James <loganjerry@gmail.com> - 2.5.2-1
+- New upstream release
+- Link with -lrt to get the clock_* functions
+- Convince libtool to use -Wl,--as-needed appropriately
+
 * Wed Sep 12 2012 Jerry James <loganjerry@gmail.com> - 2.5.1-1
 - New upstream release
 - License change to LPGLv3+
diff --git a/sources b/sources
index 936192c..426111a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae0222b06729bbaff1c2e869427d79d2  mpir-2.5.1.tar.bz2
+b7d7bf24ec9e6c85021ff3c3e010546b  mpir-2.5.2.tar.bz2