From a7d06efe4856ea76b1ffa15ed398099cc963d14a Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Wed, 23 Jan 2013 13:25:42 -0800
Subject: file: Update to 5.12

Remove the backported automake patch, now fixed upstream

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../file/file/obsolete_automake_macros.patch       | 15 ---------
 meta/recipes-devtools/file/file_5.11.bb            | 39 ----------------------
 meta/recipes-devtools/file/file_5.12.bb            | 38 +++++++++++++++++++++
 3 files changed, 38 insertions(+), 54 deletions(-)
 delete mode 100644 meta/recipes-devtools/file/file/obsolete_automake_macros.patch
 delete mode 100644 meta/recipes-devtools/file/file_5.11.bb
 create mode 100644 meta/recipes-devtools/file/file_5.12.bb

(limited to 'meta')

diff --git a/meta/recipes-devtools/file/file/obsolete_automake_macros.patch b/meta/recipes-devtools/file/file/obsolete_automake_macros.patch
deleted file mode 100644
index 84a78a5770..0000000000
--- a/meta/recipes-devtools/file/file/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [fixed in file-5.12]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd file-5.11/configure.ac file-5.11/configure.ac
---- file-5.11/configure.ac	2012-02-21 21:16:29.000000000 +0200
-+++ file-5.11/configure.ac	2013-01-02 07:18:23.004856505 +0200
-@@ -3,7 +3,7 @@
- AM_INIT_AUTOMAKE()
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_MACRO_DIR([m4])
-
- AC_MSG_CHECKING(for builtin ELF support)
diff --git a/meta/recipes-devtools/file/file_5.11.bb b/meta/recipes-devtools/file/file_5.11.bb
deleted file mode 100644
index 52ae460e60..0000000000
--- a/meta/recipes-devtools/file/file_5.11.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "File classification tool"
-DESCRIPTION = "File attempts to classify files depending \
-on their contents and prints a description if a match is found."
-HOMEPAGE = "http://www.darwinsys.com/file/"
-SECTION = "console/utils"
-
-# two clause BSD
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03188"
-
-DEPENDS = "zlib file-native"
-DEPENDS_class-native = "zlib-native"
-PR = "r1"
-
-SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
-           file://fix_version_check.patch \
-           file://obsolete_automake_macros.patch \
-           file://dump \
-           file://filesystems"
-
-SRC_URI[md5sum] = "16a407bd66d6c7a832f3a5c0d609c27b"
-SRC_URI[sha256sum] = "c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7"
-
-inherit autotools
-
-do_configure_prepend() {
-	cp ${WORKDIR}/dump ${S}/magic/Magdir/
-	cp ${WORKDIR}/filesystems ${S}/magic/Magdir/
-}
-
-FILES_${PN} += "${datadir}/misc/*.mgc"
-
-do_install_append_class-native() {
-	create_cmdline_wrapper ${D}/${bindir}/file \
-		--magic-file ${datadir}/misc/magic.mgc
-}
-
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/file/file_5.12.bb b/meta/recipes-devtools/file/file_5.12.bb
new file mode 100644
index 0000000000..4677a6d4c7
--- /dev/null
+++ b/meta/recipes-devtools/file/file_5.12.bb
@@ -0,0 +1,38 @@
+SUMMARY = "File classification tool"
+DESCRIPTION = "File attempts to classify files depending \
+on their contents and prints a description if a match is found."
+HOMEPAGE = "http://www.darwinsys.com/file/"
+SECTION = "console/utils"
+
+# two clause BSD
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03188"
+
+DEPENDS = "zlib file-native"
+DEPENDS_class-native = "zlib-native"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
+           file://fix_version_check.patch \
+           file://dump \
+           file://filesystems"
+
+SRC_URI[md5sum] = "1d7d85cb9354f79e5e351deef36be6ba"
+SRC_URI[sha256sum] = "199d0dab2e32814cbced8dc30d3d2d5b7e45587598160a2c401358b573273d22"
+
+inherit autotools
+
+do_configure_prepend() {
+	cp ${WORKDIR}/dump ${S}/magic/Magdir/
+	cp ${WORKDIR}/filesystems ${S}/magic/Magdir/
+}
+
+FILES_${PN} += "${datadir}/misc/*.mgc"
+
+do_install_append_class-native() {
+	create_cmdline_wrapper ${D}/${bindir}/file \
+		--magic-file ${datadir}/misc/magic.mgc
+}
+
+
+BBCLASSEXTEND = "native"
-- 
cgit 1.2.3-korg