3 files changed, 23 insertions, 18 deletions

diff --git a/meta/packages/shared-mime-info/shared-mime-info.inc b/meta/packages/shared-mime-info/shared-mime-info.inc
new file mode 100644
index 0000000000..3e591ad2d6
--- /dev/null
+++ b/meta/packages/shared-mime-info/shared-mime-info.inc
@@ -0,0 +1,21 @@
+SECTION = "base"
+LICENSE = "GPL"
+DEPENDS = "libxml2 intltool-native"
+PR = "r0"
+
+SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.bz2"
+
+inherit autotools pkgconfig gettext
+
+EXTRA_OECONF = "--disable-update-mimedb"
+
+FILES_${PN} += "${datadir}/mime"
+FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc"
+
+pkg_postinst () {
+if [ "x$D" != "x" ]; then
+        exit 1
+fi
+  echo "Updating MIME database... this may take a while."
+  ${bindir}/update-mime-database ${datadir}/mime
+}
diff --git a/meta/packages/shared-mime-info/shared-mime-info_0.16.bb b/meta/packages/shared-mime-info/shared-mime-info_0.16.bb
deleted file mode 100644
index 746012b7e1..0000000000
--- a/meta/packages/shared-mime-info/shared-mime-info_0.16.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "base"
-PR = "r2"
-
-DEPENDS = "libxml2 intltool-native glib-2.0"
-
-SRC_URI = "http://freedesktop.org/~jrb/shared-mime-info-${PV}.tar.gz"
-LICENSE = "GPL"
-inherit autotools pkgconfig gettext
-
-FILES_${PN} += "${datadir}/mime"
-#FILES_${PN}-doc += " ${datadir}/gtk-doc"
-
-EXTRA_OECONF = "--disable-update-mimedb"
-
-pkg_postinst () {
-  echo "Updating MIME database in $D${datadir}/mime ... (This may take a while.)"
-  ${bindir}/update-mime-database $D${datadir}/mime
-}
diff --git a/meta/packages/shared-mime-info/shared-mime-info_0.22.bb b/meta/packages/shared-mime-info/shared-mime-info_0.22.bb
new file mode 100644
index 0000000000..f24008ec13
--- /dev/null
+++ b/meta/packages/shared-mime-info/shared-mime-info_0.22.bb
@@ -0,0 +1,2 @@
+require shared-mime-info.inc
+