From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 22 Feb 2015 14:52:35 +0000 (+0100)
Subject: mpc: Move mpc-compat package into own build file.
X-Git-Url: http://git.ipfire.org/?p=ipfire-3.x.git;a=commitdiff_plain;h=132b63661463908d4affabb7b77d2f785c980ce5

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

Fixes #10742.
---

diff --git a/compat-libmpc/compat-libmpc.nm b/compat-libmpc/compat-libmpc.nm
new file mode 100644
index 000000000..123cfec17
--- /dev/null
+++ b/compat-libmpc/compat-libmpc.nm
@@ -0,0 +1,67 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = compat-libmpc
+version    = 0.9
+release    = 1
+
+thisapp    = mpc-%{version}
+
+groups     = System/Libraries
+url        = http://www.multiprecision.org/
+license    = LGPLv2.1+
+summary    = Mpc is a C library for the arithmetic of complex numbers.
+
+description
+	Mpc is a C library for the arithmetic of complex numbers with
+	arbitrarily high precision and correct rounding of the result.
+	It is built upon and follows the same principles as Mpfr.
+end
+
+source_dl  = http://www.multiprecision.org/mpc/download/
+
+build
+	requires
+		gmp-devel >= 4.3.2
+		mpfr-devel >= 2.4.2
+	end
+
+	export EGREP = egrep
+
+	configure_options += \
+		--disable-static \
+		--enable-shared
+
+	test
+		make check
+	end
+
+	install
+		# Only install libraries.
+		mkdir -pv %{BUILDROOT}%{libdir}
+		install -m 644 src/.libs/libmpc.so.2.0.0 %{BUILDROOT}%{libdir}
+		ln -svf libmpc.so.2.0.0 %{BUILDROOT}%{libdir}/libmpc.so.2
+	end
+end
+
+packages
+	package %{name}
+		provides
+			mpc = %{thisver}
+		end
+
+		obsoletes
+			mpc-compat
+		end
+
+		conflicts
+			mpc <= %{thisver}
+		end
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/libmpc/libmpc.nm b/libmpc/libmpc.nm
index a1d1d5c87..d5f68e6f6 100644
--- a/libmpc/libmpc.nm
+++ b/libmpc/libmpc.nm
@@ -5,11 +5,9 @@
 
 name       = libmpc
 version    = 1.0
-release    = 1
+release    = 2
 thisapp    = mpc-%{version}
 
-compat_version = 0.9
-
 groups     = System/Libraries
 url        = http://www.multiprecision.org/
 license    = LGPLv2.1+
@@ -22,7 +20,6 @@ description
 end
 
 source_dl  = http://www.multiprecision.org/mpc/download/
-sources   += mpc-%{compat_version}.tar.gz
 
 build
 	requires
@@ -34,28 +31,10 @@ build
 		--enable-shared \
 		--disable-static
 
-	build_cmds
-		cd %{DIR_SRC}/mpc-%{compat_version}
-		EGREP=egrep ./configure \
-			%{configure_options}
-
-		make %{PARALLELISMFLAGS}
-	end
-
 	test
-		export LD_LIBRARY_PATH=$(pwd)/src/.libs
-		make check
-
-		cd %{DIR_SRC}/mpc-%{compat_version}
-		export LD_LIBRARY_PATH=$(pwd)/src/.libs
+		#export LD_LIBRARY_PATH=$(pwd)/src/.libs
 		make check
 	end
-
-	install_cmds
-		cd %{DIR_SRC}/mpc-%{compat_version}
-		install -m 644 src/.libs/libmpc.so.2.0.0 %{BUILDROOT}%{libdir}
-		ln -svf libmpc.so.2.0.0 %{BUILDROOT}%{libdir}/libmpc.so.2
-	end
 end
 
 packages
@@ -65,14 +44,6 @@ packages
 		template DEVEL
 	end
 
-	package %{name}-compat
-		summary = Compat libraries of %{thisapp}.
-
-		files
-			%{libdir}/libmpc.so.2*
-		end
-	end
-
 	package %{name}-debuginfo
 		template DEBUGINFO
 	end