shared-mime-info: upgrade to 1.0

parallelmake.patch: adapt to the new version

(From OE-Core rev: 07b0425a937cc36874909a47daa4def92d0bfe82)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 14 insertions, 13 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 8b6f9e524e..82ab1d2bbe 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
@@ -9,23 +9,24 @@ dependencies and stop itself racing itself.
 RP 10/10/2011
 
 Upstream-Status: Pending
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
 
-Index: shared-mime-info-0.91/Makefile.am
+Index: shared-mime-info-1.0/Makefile.am
 ===================================================================
---- shared-mime-info-0.91.orig/Makefile.am      2011-10-10 21:47:19.834173921 +0100
-+++ shared-mime-info-0.91/Makefile.am   2011-10-10 21:45:57.000000000 +0100
+--- shared-mime-info-1.0.orig/Makefile.am
++++ shared-mime-info-1.0/Makefile.am
 @@ -1,5 +1,3 @@
 -SUBDIRS=. po
 -
  INCLUDES = $(ALL_CFLAGS)
  
  packagesdir = $(datadir)/mime/packages
-@@ -70,8 +68,7 @@
+@@ -72,8 +70,7 @@ uninstall-hook:
  
  all: check create-pot
  
 -create-pot:
--       $(MAKE) -C po shared-mime-info.pot
+-       $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot
 +create-pot: po
  
  check: create-pot freedesktop.org.xml update-mime-database check-translations
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
deleted file mode 100644
index 910cb7fc5d..0000000000
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require shared-mime-info.inc
-PR = "r4"
-
-SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
-SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
-
-SRC_URI =+ "file://parallelmake.patch \
-            file://install-data-hook.patch"
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_1.0.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_1.0.bb
new file mode 100644
index 0000000000..d9b7b5149b
--- /dev/null
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_1.0.bb
@@ -0,0 +1,8 @@
+require shared-mime-info.inc
+PR = "r0"
+
+SRC_URI[md5sum] = "901b7977dbb2b71d12d30d4d8fb97028"
+SRC_URI[sha256sum] = "d2e830e5aae213dd906e64495e9618cc4ef40d7b249e0971a190b04d5802ae8f"
+
+SRC_URI =+ "file://parallelmake.patch \
+            file://install-data-hook.patch"