[OE-core] [PATCH] mpfr: merge bb/inc and fix license

[Ross Burton]

Merge the bb/inc as there's no reason to split them.

Remove redundant S assignment.

Fix the LICENSE assignment to LGPLv3+.  The source of mpfr is Lesser GPL v3 or
higher, the GPL is assigned to some test data that isn't shipped.

Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-support/mpfr/mpfr.inc      |  6 ------
 meta/recipes-support/mpfr/mpfr_3.1.5.bb | 10 ++++++----
 2 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 meta/recipes-support/mpfr/mpfr.inc

diff --git a/meta/recipes-support/mpfr/mpfr.inc b/meta/recipes-support/mpfr/mpfr.inc
deleted file mode 100644
index 7f3f9175dc4..00000000000
--- a/meta/recipes-support/mpfr/mpfr.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SUMMARY = "C library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE = "http://www.mpfr.org/"
-LICENSE = "LGPLv3+"
-SECTION = "devel"
-
-inherit autotools texinfo
diff --git a/meta/recipes-support/mpfr/mpfr_3.1.5.bb b/meta/recipes-support/mpfr/mpfr_3.1.5.bb
index 2d59c4a1be1..a78c0bd4865 100644
--- a/meta/recipes-support/mpfr/mpfr_3.1.5.bb
+++ b/meta/recipes-support/mpfr/mpfr_3.1.5.bb
@@ -1,6 +1,10 @@
-require mpfr.inc
+SUMMARY = "C library for multiple-precision floating-point computations with exact rounding"
+HOMEPAGE = "http://www.mpfr.org/"
+LICENSE = "LGPLv3+"
+SECTION = "devel"
+
+inherit autotools texinfo
 
-LICENSE = "GPLv3 & LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 		    file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6"
 DEPENDS = "gmp"
@@ -13,6 +17,4 @@ SRC_URI[sha256sum] = "015fde82b3979fbe5f83501986d328331ba8ddf008c1ff3da3c238f49c
 
 UPSTREAM_CHECK_URI = "http://www.mpfr.org/mpfr-current/"
 
-S = "${WORKDIR}/mpfr-${PV}"
-
 BBCLASSEXTEND = "native nativesdk"
-- 
2.11.0