From 3399fe6d629cb263c8d97617eb3564a96fac4eeddb261dbdc2535e7bf5ac78c1 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Mon, 9 Aug 2010 22:37:49 +0000
Subject: [PATCH] Updating link to change in openSUSE:Factory/gvfs revision
 58.0

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=5fac360dd02bcdc48e870f5fbfcdacfc
---
 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, 38 insertions(+), 19 deletions(-)
 create mode 100644 baselibs.conf
 delete mode 100644 gvfs-1.6.1.tar.bz2
 create mode 100644 gvfs-1.6.3.tar.bz2

diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..d074060
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1,3 @@
+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
deleted file mode 100644
index 7449c41..0000000
--- a/gvfs-1.6.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-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
new file mode 100644
index 0000000..138d139
--- /dev/null
+++ b/gvfs-1.6.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e3fe2dd80e5baaf4c1844560f6a787b144a917de1cb457b41efcb338477e760
+size 1347090
diff --git a/gvfs.changes b/gvfs.changes
index ea91c7b..000bc40 100644
--- a/gvfs.changes
+++ b/gvfs.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+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 39c71fb..57927af 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gvfs (Version 1.6.1)
+# spec file for package gvfs (Version 1.6.3)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,13 +18,14 @@
 
 
 Name:           gvfs
-Version:        1.6.1
-Release:        2
+Version:        1.6.3
+Release:        1
 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.
@@ -56,13 +57,11 @@ 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.
@@ -144,18 +143,10 @@ chmod -x %{buildroot}%{_sysconfdir}/profile.d/*
 %find_lang %{name}
 
 %post
-%if "%{_lib}" == "lib64"
-  %{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules
-%else
-  %{_bindir}/gio-querymodules %{_libdir}/gio/modules
-%endif
+%glib2_gio_module_post
 
 %postun
-%if "%{_lib}" == "lib64"
-  %{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules
-%else
-  %{_bindir}/gio-querymodules %{_libdir}/gio/modules
-%endif
+%glib2_gio_module_postun
 
 %post -n libgvfscommon0 -p /sbin/ldconfig