[git.ipfire.org] IPFire 3.x development tree branch, master, updated. c3cb7c9724db1649aac420bec4859e210623a131

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. c3cb7c9724db1649aac420bec4859e210623a131

[git]

[-- Attachment #1: Type: text/plain, Size: 4775 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  c3cb7c9724db1649aac420bec4859e210623a131 (commit)
       via  132b63661463908d4affabb7b77d2f785c980ce5 (commit)
      from  6318444799504c6947e574bc88141b35e9106fd5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c3cb7c9724db1649aac420bec4859e210623a131
Merge: 6318444 132b636
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Feb 22 17:41:10 2015 +0100

    Merge remote-tracking branch 'stevee/compat-packages'

commit 132b63661463908d4affabb7b77d2f785c980ce5
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun Feb 22 15:52:35 2015 +0100

    mpc: Move mpc-compat package into own build file.
    
    Fixes #10742.

-----------------------------------------------------------------------

Summary of changes:
 libmpc/libmpc.nm => compat-libmpc/compat-libmpc.nm | 48 ++++++++--------------
 libmpc/libmpc.nm                                   | 33 +--------------
 2 files changed, 20 insertions(+), 61 deletions(-)
 copy libmpc/libmpc.nm => compat-libmpc/compat-libmpc.nm (65%)

Difference in files:
diff --git a/compat-libmpc/compat-libmpc.nm b/compat-libmpc/compat-libmpc.nm
new file mode 100644
index 0000000..123cfec
--- /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(a)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 a1d1d5c..d5f68e6 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


hooks/post-receive
--
IPFire 3.x development tree