Accepting request 32542 from home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/gvfs via accept of submit request 32542 revision 2.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/32542
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=67

gvfs-no-querymodule-on-install.patch

@@ -0,0 +1,28 @@
+From f609ecec4e8c23659cbd0ebd4c7357d2969dc7cc Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Sun, 14 Feb 2010 18:38:04 +0100
+Subject: [PATCH] Do not call gio-querymodules on install when DESTDIR is set
+
+This is a bug introduced in a18a1896c0bceaf9a467f00a9678e322d615e786. We
+want to call gio-querymodules on install, except when building a
+package.
+---
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4dde338..25f939a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -33,7 +33,7 @@ distclean-local:
+ 	fi
+ 
+ install-data-hook:
+-	if test ! -z "$(DESTDIR)" -a "$(GIO_QUERYMODULES)" != "no" ; then					\
++	if test -z "$(DESTDIR)" -a "$(GIO_QUERYMODULES)" != "no" ; then					\
+ 		$(GIO_QUERYMODULES) $(DESTDIR)$(giomodulesdir) ;	\
+ 	fi
+ 
+-- 
+1.6.6.1
+

gvfs.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Feb 14 18:39:40 CET 2010 - vuntz@opensuse.org
+
+- Add gvfs-no-querymodule-on-install.patch to fix build.
+
 -------------------------------------------------------------------
 Fri Feb 12 14:17:13 CET 2010 - dimstar@opensuse.org
 

gvfs.spec

@@ -26,6 +26,8 @@ Summary:        VFS functionality for GLib
 Url:            http://www.gnome.org
 Group:          Development/Libraries/C and C++
 Source0:        %{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM gvfs-no-querymodule-on-install.patch bgo609927 vuntz@opensuse.org -- Do not call gio-querymodules on make install
+Patch0:         gvfs-no-querymodule-on-install.patch
 # PATCH-FEATURE-OPENSUSE gvfs-dice-backend.patch hpj@suse.de -- Implements Novell IceDesktop backend. Should be upstreamed eventually.
 Patch1:         gvfs-dice-backend.patch
 # PATCH-FIX-UPSTREAM gvfs-429959-handle-blank-schemas.patch bnc429959 hpj@suse.de -- Fix URI handler lookup with blank schemas.
@@ -110,6 +112,7 @@ VFS functionality for GLib.
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
 %patch1 -p1
 %patch4 -p1
 %patch5 -p1