From 5a14dbbc4216e5d9c2fc850bb0f1a88262b16c9d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 14 Apr 2010 14:05:47 +0200
Subject: [PATCH] glib-devel: move gio-querymodules into glib, bumprev.

--HG--
extra : convert_revision : a8302b15825994a7cda5403c7c06c8e2e7321776
---
 srcpkgs/glib/glib-devel.template | 10 +++++++---
 srcpkgs/glib/template            |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glib/glib-devel.template b/srcpkgs/glib/glib-devel.template
index af5037b557..574255fdd2 100644
--- a/srcpkgs/glib/glib-devel.template
+++ b/srcpkgs/glib/glib-devel.template
@@ -5,16 +5,20 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
 Add_dependency run zlib-devel
 Add_dependency run pcre-devel
 Add_dependency run glib
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
-	mkdir -p ${DESTDIR}/usr/share
+	mkdir -p ${DESTDIR}/usr/{lib,bin,share}
 
-	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
+	for f in $(find ${SRCPKGDESTDIR}/usr/bin -type f); do
+		[ "$(basename ${f})" = "gio-querymodules" ] && continue
+		mv ${f} ${DESTDIR}/usr/bin
+	done
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/glib-2.0 ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 6006b8017f..fcfcb6a5cd 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,7 @@
 # Template build file for 'glib'
 pkgname=glib
 version=2.24.0
+revision=1
 distfiles="${GNOME_SITE}/glib/2.24/glib-$version.tar.bz2"
 configure_args="--disable-fam --with-pcre=system"
 build_style=gnu_configure