mpfr: Move mpfr-compat package into own build file.

Update the mpfr main package to 3.1.2 to allow build with gmp 6.0.0 or higher.

The compat-mpfr package cannot be build with gmp series 6 or higher, so there is a
build dependecy below that version.

Fixes #10522.

diff --git a/compat-mpfr/compat-mpfr.nm b/compat-mpfr/compat-mpfr.nm
new file mode 100644 (file)
index 0000000..d9cfbb6
--- /dev/null
+++ b/compat-mpfr/compat-mpfr.nm
@@ -0,0 +1,69 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = compat-mpfr
+version    = 2.4.2
+release    = 1
+
+thisapp    = mpfr-%{version}
+
+groups     = System/Libraries
+url        = http://www.mpfr.org/
+license    = LGPLv2+ and GPLv2+ and GFDL
+summary    = A C library for multiple-precision floating-point computations.
+
+description
+       The MPFR library is a C library for multiple-precision floating-point
+       computations with correct rounding. The MPFR is efficient and
+       also has a well-defined semantics. It copies the good ideas from the
+       ANSI/IEEE-754 standard for double-precision floating-point arithmetic
+       (53-bit mantissa). MPFR is based on the GMP multiple-precision
+       library.
+end
+
+source_dl  = http://ftp.gnu.org/gnu/mpfr/
+
+build
+       requires
+               gmp-devel >= 4.3.2
+               gmp-devel < 6.0.0
+       end
+
+       configure_options += \
+               --enable-thread-safe \
+               --disable-assert
+
+       test
+               export LD_LIBRARY_PATH=$(pwd)/.libs
+               make check
+       end
+
+       install
+               # Only install libraries.
+               mkdir -pv %{BUILDROOT}%{libdir}
+               install -m 644 .libs/libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}
+               ln -svf libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}/libmpfr.so.1
+       end
+end
+
+packages
+       package %{name}
+               provides
+                       mpfr = %{thisver}
+               end
+
+               obsoletes
+                       mpfr-compat
+               end
+
+               conflicts
+                       mpfr <= %{thisver}
+               end
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end

diff --git a/mpfr/mpfr.nm b/mpfr/mpfr.nm
index 0615b74b04337e97856f1adc0a494884f953d826..981bd8f13908636698e44b8ac8d875e3048981e7 100644 (file)
--- a/mpfr/mpfr.nm
+++ b/mpfr/mpfr.nm
@@ -4,10 +4,8 @@
 ###############################################################################
 
 name       = mpfr
 ###############################################################################
 
 name       = mpfr

-version    = 3.1.0
-release    = 2
-
-compat_version = 2.4.2
+version    = 3.1.2
+release    = 1

 
 groups     = System/Libraries
 url        = http://www.mpfr.org/
 
 groups     = System/Libraries
 url        = http://www.mpfr.org/


@@ -24,41 +22,20 @@ description
 end
 
 source_dl  = http://mpfr.loria.fr/mpfr-%{version}/
 end
 
 source_dl  = http://mpfr.loria.fr/mpfr-%{version}/

-sources   += %{name}-%{compat_version}.tar.bz2

 
 build
        requires
 
 build
        requires

-               gmp-devel>=4.3.2
+               gmp-devel >= 4.3.2

        end
 
        configure_options += \
                --enable-thread-safe \
                --disable-assert
 
        end
 
        configure_options += \
                --enable-thread-safe \
                --disable-assert
 

-       build_cmds
-
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-               ./configure \
-                       %{configure_options}
-
-               export LD_LIBRARY_PATH=$(pwd)/.libs
-               make %{PARALLELISMFLAGS}
-       end
-

        test
        test

-               export LD_LIBRARY_PATH=$(pwd)/.libs
-               make check
-
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-               export LD_LIBRARY_PATH=$(pwd)/.libs
+               export LD_LIBRARY_PATH=$(pwd)/src/.libs

                make check
        end
                make check
        end

-
-       install_cmds
-               cd %{DIR_SRC}/%{name}-%{compat_version}
-               install -m 644 .libs/libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}
-               ln -svf libmpfr.so.1.2.2 %{BUILDROOT}%{libdir}/libmpfr.so.1
-       end

 end
 
 packages
 end
 
 packages


@@ -68,14 +45,6 @@ packages
                template DEVEL
        end
 
                template DEVEL
        end
 

-       package %{name}-compat
-               summary = Compat libraries of %{thisapp}.
-
-               files
-                       %{libdir}/libmpfr.so.1*
-               end
-       end
-

        package %{name}-debuginfo
                template DEBUGINFO
        end
        package %{name}-debuginfo
                template DEBUGINFO
        end