shared-mime-info: upgrade to 1.2

Adapted parallelmake.patch to the new Makefile.am.

(From OE-Core rev: 30a3dba92f38b8877954e2c7da0c9c18be420d8a)

Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 9 insertions, 9 deletions

diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
index 82ab1d2bbe..84c4d03731 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
@@ -18,12 +18,12 @@ Index: shared-mime-info-1.0/Makefile.am
 @@ -1,5 +1,3 @@
 -SUBDIRS=. po
 -
- INCLUDES = $(ALL_CFLAGS)
+ AM_CPPFLAGS = $(ALL_CFLAGS)
  
  packagesdir = $(datadir)/mime/packages
 @@ -72,8 +70,7 @@ uninstall-hook:
  
- all: check create-pot
+ all: $(defaultmakedeps)
  
 -create-pot:
 -       $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_1.1.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_1.1.bb
deleted file mode 100644
index ecf6fba974..0000000000
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_1.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require shared-mime-info.inc
-
-SRC_URI[md5sum] = "12ba00bf1cb2e69bfba73127e708e833"
-SRC_URI[sha256sum] = "184d094b157a9ec2607ad26a1a1837e6e07f3fcbeb38d8b6d412906156f9e06c"
-
-SRC_URI =+ "file://parallelmake.patch \
-            file://install-data-hook.patch"
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_1.2.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_1.2.bb
new file mode 100644
index 0000000000..11fd6ded64
--- /dev/null
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_1.2.bb
@@ -0,0 +1,7 @@
+require shared-mime-info.inc
+
+SRC_URI[md5sum] = "8f90f3f2b8478fa47e70678d34013f99"
+SRC_URI[sha256sum] = "a5516ae241b95a948a6749b1cbf65dc20c3bb563a73cc7bedb7065933788bb78"
+
+SRC_URI =+ "file://parallelmake.patch \
+            file://install-data-hook.patch"