From ee1f8b9c006a379c5371ac9dc76359bd06c88143 Mon Sep 17 00:00:00 2001
From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 27 Apr 2014 11:50:31 +0200
Subject: [PATCH] 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.
---
 compat-mpfr/compat-mpfr.nm | 69 ++++++++++++++++++++++++++++++++++++++
 mpfr/mpfr.nm               | 39 +++------------------
 2 files changed, 73 insertions(+), 35 deletions(-)
 create mode 100644 compat-mpfr/compat-mpfr.nm

diff --git a/compat-mpfr/compat-mpfr.nm b/compat-mpfr/compat-mpfr.nm
new file mode 100644
index 000000000..d9cfbb606
--- /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 0615b74b0..981bd8f13 100644
--- a/mpfr/mpfr.nm
+++ b/mpfr/mpfr.nm
@@ -4,10 +4,8 @@
 ###############################################################################
 
 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/
@@ -24,41 +22,20 @@ description
 end
 
 source_dl  = http://mpfr.loria.fr/mpfr-%{version}/
-sources   += %{name}-%{compat_version}.tar.bz2
 
 build
 	requires
-		gmp-devel>=4.3.2
+		gmp-devel >= 4.3.2
 	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
-		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
-
-	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
@@ -68,14 +45,6 @@ packages
 		template DEVEL
 	end
 
-	package %{name}-compat
-		summary = Compat libraries of %{thisapp}.
-
-		files
-			%{libdir}/libmpfr.so.1*
-		end
-	end
-
 	package %{name}-debuginfo
 		template DEBUGINFO
 	end
-- 
2.39.2