[mpfi] New upstream version. Drop BuildRoot tag, %clean script, and clean at start of %install script. Drop

[Jerry James]

commit 1a60336f71595f4969b17f8404cebe11195aff65
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon Apr 25 15:17:25 2011 -0600

    New upstream version.
    Drop BuildRoot tag, %clean script, and clean at start of %install script.
    Drop texinfo patch, upstreamed.
    Move static library into -static subpackage.
    Add %check script.

 .gitignore               |    2 +-
 mpfi-1.3.4-RC3-texi.diff |   94 ----------------------------------------------
 mpfi-test-debian.patch   |   21 ++++++++++
 mpfi.spec                |   68 ++++++++++++++++++++++++---------
 sources                  |    2 +-
 5 files changed, 72 insertions(+), 115 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19d955a..1a230b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-mpfi-1.3.4-RC3.tar.gz
+mpfi-1.5.tar.bz2
diff --git a/mpfi-test-debian.patch b/mpfi-test-debian.patch
new file mode 100644
index 0000000..99307ce
--- /dev/null
+++ b/mpfi-test-debian.patch
@@ -0,0 +1,21 @@
+--- tests/tis_zero.c.orig	2010-08-04 07:03:33.000000000 -0600
++++ tests/tis_zero.c	2011-04-25 14:58:40.557272871 -0600
+@@ -60,13 +60,16 @@ main (int argc, char **argv)
+     mpfr_set_prec (x, p);
+     mpfi_set_prec (interval, p);
+ 
+-    random_mpfr (x); /* x != 0*/
++    random_mpfr (x);
+     mpfi_set_fr (interval, x);
+-    if (mpfi_is_zero (interval)) {
++    if (mpfi_is_zero (interval) && !mpfr_zero_p (x)) {
+       print_error (interval);
+     }
+ 
+     random_mpfr (x);
++    if (mpfr_zero_p (x))
++      mpfr_nextabove (x);
++    /* x != 0 */
+     mpfi_put_fr (interval, x);
+     if (mpfi_is_zero (interval)) {
+       print_error (interval);
diff --git a/mpfi.spec b/mpfi.spec
index ae9ea1b..d73bad1 100644
--- a/mpfi.spec
+++ b/mpfi.spec
@@ -1,19 +1,19 @@
 Name:           mpfi
-Version:        1.3.4
-Release:        0.8.RC3%{?dist}
+Version:        1.5
+Release:        1%{?dist}
 Summary:        An interval arithmetic library based on MPFR
 Group:          Applications/Engineering
 License:        LGPLv2+
-URL:            http://perso.ens-lyon.fr/nathalie.revol/software.html#download
-Source0:        http://gforge.inria.fr/frs/download.php/468/%{name}-%{version}-RC3.tar.gz
-Patch0:         mpfi-1.3.4-RC3-texi.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:            http://perso.ens-lyon.fr/nathalie.revol/software.html
+Source0:        http://gforge.inria.fr/frs/download.php/27345/%{name}-%{version}.tar.bz2
+# This patch is from the Debian patch tracker.  It fixes a test that may
+# otherwise fail spuriously.
+Patch0:         mpfi-test-debian.patch
 
 BuildRequires:  mpfr-devel
 BuildRequires:  gmp-devel
-BuildRequires:  texinfo
-Requires(post): /sbin/install-info
-Requires(preun):  /sbin/install-info
+Requires(post): info
+Requires(preun):  info
 
 
 %description
@@ -33,7 +33,7 @@ standard for floating-point arithmetic.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Provides:       %{name}-static = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}, gmp-devel, mpfr-devel
 
 
 %description    devel
@@ -41,10 +41,18 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 
+%package        static
+Summary:        Static library for %{name}
+Group:          Development/Libraries
+
+
+%description    static
+The %{name}-static package contains the static %{name} library.
+
+
 %prep
-%setup -q -n mpfi-%{version}-RC3
-%patch0 -p1
-cp -p /usr/lib/rpm/config.{guess,sub} .
+%setup -q
+%patch0
 
 
 %build
@@ -53,10 +61,22 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 
+# Remove libtool archives
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+# Remove dir file in the info directory
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
+
+%check
+make check
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %post devel
 /sbin/install-info \
@@ -68,21 +88,31 @@ if [ $1 = 0 ]; then
     --info-dir=%{_infodir} %{_infodir}/mpfi.info || :
 fi
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS NEWS TODO
+%{_libdir}/libmpfi.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc AUTHORS NEWS
 %{_includedir}/mpfi.h
 %{_includedir}/mpfi_io.h
 %{_infodir}/%{name}.info*
+%{_libdir}/libmpfi.so
+
+%files static
+%defattr(-,root,root,-)
 %{_libdir}/lib%{name}.a
 
 
 %changelog
+* Mon Apr 25 2011 Jerry James <loganjerry at gmail.com> - 1.5-1
+- New upstream version.
+- Drop BuildRoot tag, clean script, and clean at start of install script.
+- Drop texinfo patch, upstreamed.
+- Move static library into -static subpackage.
+- Add check script.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.4-0.8.RC3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index d28480d..b502f2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02f3fb7a09ef683f035dd20dca653507  mpfi-1.3.4-RC3.tar.gz
+63e4f54b7d172328c72ef3eaed72901f  mpfi-1.5.tar.bz2