From b7027645fd05f76e191558d870e6076b037e18ea470bc5bbdc41f69dc19cb039 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Tue, 11 Oct 2011 12:49:40 +0000 Subject: [PATCH] - Update to version 3.1.0. * The mpfr_urandom and mpfr_urandomb functions now return identical values on processors with different word size. * Speed improvement for the mpfr_sqr and mpfr_div functions using Mulders' algorithm. * Much faster formatted output (mpfr_printf, etc.) with %Rg and similar. * New divide-by-zero exception (flag) and associated functions. - Remove bogus provides/obsoletes for old shared library version. - Fix license, it is LGPL v3 or later. OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/mpfr?expand=0&rev=16 --- mpfr-3.0.1.tar.bz2 | 3 --- mpfr-3.1.0-patch01.diff | 50 +++++++++++++++++++++++++++++++++++++++++ mpfr-3.1.0.tar.bz2 | 3 +++ mpfr.changes | 13 +++++++++++ mpfr.spec | 50 +++++++++-------------------------------- 5 files changed, 77 insertions(+), 42 deletions(-) delete mode 100644 mpfr-3.0.1.tar.bz2 create mode 100644 mpfr-3.1.0-patch01.diff create mode 100644 mpfr-3.1.0.tar.bz2 diff --git a/mpfr-3.0.1.tar.bz2 b/mpfr-3.0.1.tar.bz2 deleted file mode 100644 index 098d20e..0000000 --- a/mpfr-3.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1977099bb494319c0f0c1f85759050c418a56884e9c6cef1c540b9b13e38e7f -size 1154306 diff --git a/mpfr-3.1.0-patch01.diff b/mpfr-3.1.0-patch01.diff new file mode 100644 index 0000000..f61aff5 --- /dev/null +++ b/mpfr-3.1.0-patch01.diff @@ -0,0 +1,50 @@ +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-10-05 21:39:57.000000000 +0000 +@@ -0,0 +1 @@ ++mpfr_unlikely +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-03 08:17:15.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-10-05 21:39:57.000000000 +0000 +@@ -1 +1 @@ +-3.1.0 ++3.1.0-p1 +diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h +--- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 +@@ -988,10 +988,11 @@ + ******************************************************/ + + /* Theses macros help the compiler to determine if a test is +- * likely or unlikely. */ ++ likely or unlikely. The !! is necessary in case x is larger ++ than a long. */ + #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0) + # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1)) +-# define MPFR_UNLIKELY(x) (__builtin_expect((x),0)) ++# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0)) + #else + # define MPFR_LIKELY(x) (x) + # define MPFR_UNLIKELY(x) (x) +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0" ++#define MPFR_VERSION_STRING "3.1.0-p1" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-10-05 21:39:57.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0"; ++ return "3.1.0-p1"; + } diff --git a/mpfr-3.1.0.tar.bz2 b/mpfr-3.1.0.tar.bz2 new file mode 100644 index 0000000..c399b07 --- /dev/null +++ b/mpfr-3.1.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74a7bbbad168dd1cc414f1c9210b8fc16ccfc8e422d34b3371a8978e31eab680 +size 1203891 diff --git a/mpfr.changes b/mpfr.changes index 87c1140..2ec3d07 100644 --- a/mpfr.changes +++ b/mpfr.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Oct 11 12:28:31 UTC 2011 - rguenther@suse.com + +- Update to version 3.1.0. + * The mpfr_urandom and mpfr_urandomb functions now return identical + values on processors with different word size. + * Speed improvement for the mpfr_sqr and mpfr_div functions using + Mulders' algorithm. + * Much faster formatted output (mpfr_printf, etc.) with %Rg and similar. + * New divide-by-zero exception (flag) and associated functions. +- Remove bogus provides/obsoletes for old shared library version. +- Fix license, it is LGPL v3 or later. + ------------------------------------------------------------------- Fri Apr 8 13:53:10 UTC 2011 - rguenther@novell.com diff --git a/mpfr.spec b/mpfr.spec index d81c605..010f9c8 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -21,16 +21,17 @@ Name: mpfr BuildRequires: gmp-devel -License: LGPLv2.1+ +License: LGPLv3+ Group: Development/Libraries/C and C++ AutoReqProv: on -Version: 3.0.1 +Version: 3.1.0 Release: 1 Summary: The MPFR multiple-precision floating-point library Url: http://www.mpfr.org/ Source: mpfr-%{version}.tar.bz2 Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch1: %{name}-%{version}-patch01.diff %description The MPFR library is a C library for multiple-precision floating-point @@ -44,22 +45,11 @@ standard for double-precision floating-point arithmetic (53-bit mantissa). - -Authors: --------- - Guillaume Hanrot - Paul Zimmermann - Vincent Lefèvre - Patrick Pélissier - %package -n libmpfr4 -License: LGPLv2.1+ +License: LGPLv3+ Summary: MPFR multiple-precision floating-point computation shared library Group: Development/Libraries/C and C++ AutoReqProv: on -# in openSUSE 10.2 and 10.3 the shared library was in the mpfr package itself -Provides: mpfr = 2.3.0 -Obsoletes: mpfr < 2.3.0 %description -n libmpfr4 The MPFR library is a C library for multiple-precision floating-point @@ -67,20 +57,11 @@ computations with exact rounding (also called correct rounding). It is based on the GMP multiple-precision library. - -Authors: --------- - Guillaume Hanrot - Paul Zimmermann - Vincent Lefèvre - Patrick Pélissier - %package devel -License: LGPLv2.1+ +License: LGPLv3+ Summary: MPFR multiple-precision floating-point library development files Group: Development/Libraries/C and C++ Requires: libmpfr4 = %{version} gmp-devel -Provides: gmp-devel:/usr/lib/libmpfr.a AutoReqProv: on PreReq: %install_info_prereq @@ -88,23 +69,16 @@ PreReq: %install_info_prereq MPFR multiple-precision floating-point library development files - -Authors: --------- - Guillaume Hanrot - Paul Zimmermann - Vincent Lefèvre - Patrick Pélissier - %prep %setup -q +%patch1 -p1 %build %configure \ -%if 0%{suse_version} > 1000 -%ifnarch %sparc hppa +%ifarch %sparc hppa + --disable-thread-safe \ +%else --enable-thread-safe \ -%endif %endif --enable-shared \ --docdir=%{_docdir}/mpfr @@ -117,14 +91,12 @@ make check %{?_smp_mflags} %makeinstall rm ${RPM_BUILD_ROOT}%{_libdir}/lib*.la -%post -n libmpfr4 -%run_ldconfig +%post -n libmpfr4 -p /sbin/ldconfig %post devel %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz -%postun -n libmpfr4 -%run_ldconfig +%postun -n libmpfr4 -p /sbin/ldconfig %postun devel %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz