From 0b591a7df20768028b89b48e6610ebe2396919001e26c2c4ba22ed0ec850113d Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Mon, 9 Aug 2010 22:37:48 +0000
Subject: [PATCH] Accepting request 45102 from GNOME:Factory

checked in (request 45102)

OBS-URL: https://build.opensuse.org/request/show/45102
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=84
---
 baselibs.conf      |  3 ---
 gvfs-1.6.1.tar.bz2 |  3 +++
 gvfs-1.6.3.tar.bz2 |  3 ---
 gvfs.changes       | 25 -------------------------
 gvfs.spec          | 23 ++++++++++++++++-------
 5 files changed, 19 insertions(+), 38 deletions(-)
 delete mode 100644 baselibs.conf
 create mode 100644 gvfs-1.6.1.tar.bz2
 delete mode 100644 gvfs-1.6.3.tar.bz2

diff --git a/baselibs.conf b/baselibs.conf
deleted file mode 100644
index d074060..0000000
--- a/baselibs.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-gvfs
-  post "%glib2_gio_module_post"
-  postun "%glib2_gio_module_postun"
diff --git a/gvfs-1.6.1.tar.bz2 b/gvfs-1.6.1.tar.bz2
new file mode 100644
index 0000000..7449c41
--- /dev/null
+++ b/gvfs-1.6.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad75b4a1e0d61ecc271af2f015d665709cebcf22e86b9bbe0cc7ce8a33b8d8d6
+size 1364399
diff --git a/gvfs-1.6.3.tar.bz2 b/gvfs-1.6.3.tar.bz2
deleted file mode 100644
index 138d139..0000000
--- a/gvfs-1.6.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4e3fe2dd80e5baaf4c1844560f6a787b144a917de1cb457b41efcb338477e760
-size 1347090
diff --git a/gvfs.changes b/gvfs.changes
index 000bc40..ea91c7b 100644
--- a/gvfs.changes
+++ b/gvfs.changes
@@ -1,28 +1,3 @@
--------------------------------------------------------------------
-Fri Jul 23 12:45:38 CEST 2010 - vuntz@opensuse.org
-
-- Update to version 1.6.3:
-  + fix the build against recent glib
-  + afc: remove com.apple.afc dependency
-  + afc: add password dialog
-  + ftp: fix undeclared variable
-  + ssh: improve password dialog
-  + Updated translations.
-
--------------------------------------------------------------------
-Thu Jul 22 16:31:25 CEST 2010 - vuntz@opensuse.org
-
-- Use %glib2_gio_module_* macros that have been added to glib2,
-  to make sure we always execute the right commands.
-- Add baselibs.conf.
-
--------------------------------------------------------------------
-Mon Jun 21 12:48:22 CEST 2010 - dimstar@opensuse.org
-
-- Update to version 1.6.2:
-  + bgo#619537: conflicts with GIO / recent glib
-  + Updated translations.
-
 -------------------------------------------------------------------
 Thu May 27 14:28:11 UTC 2010 - dimstar@opensuse.org
 
diff --git a/gvfs.spec b/gvfs.spec
index 57927af..39c71fb 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gvfs (Version 1.6.3)
+# spec file for package gvfs (Version 1.6.1)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,14 +18,13 @@
 
 
 Name:           gvfs
-Version:        1.6.3
-Release:        1
+Version:        1.6.1
+Release:        2
 License:        LGPLv2.0+
 Summary:        VFS functionality for GLib
 Url:            http://www.gnome.org
 Group:          Development/Libraries/C and C++
 Source0:        %{name}-%{version}.tar.bz2
-Source99:       baselibs.conf
 # 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.
@@ -57,11 +56,13 @@ BuildRequires:  libgudev-1_0-devel
 %endif
 Requires:       %{name}-lang = %{version}
 Requires:       libgvfscommon0 = %{version}
+# we need gio-querymodules in %post/%postun
+Requires(post): glib2
+Requires(postun): glib2
 Recommends:     gvfs-backends
 Recommends:     gvfs-common
 Recommends:     gvfs-fuse
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%glib2_gio_module_requires
 
 %description
 VFS functionality for GLib.
@@ -143,10 +144,18 @@ chmod -x %{buildroot}%{_sysconfdir}/profile.d/*
 %find_lang %{name}
 
 %post
-%glib2_gio_module_post
+%if "%{_lib}" == "lib64"
+  %{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules
+%else
+  %{_bindir}/gio-querymodules %{_libdir}/gio/modules
+%endif
 
 %postun
-%glib2_gio_module_postun
+%if "%{_lib}" == "lib64"
+  %{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules
+%else
+  %{_bindir}/gio-querymodules %{_libdir}/gio/modules
+%endif
 
 %post -n libgvfscommon0 -p /sbin/ldconfig