[gvfs] 1.9.5

[Matthias Clasen]

commit 8b37c31af4fff8660f8712824fa61af6121b7812
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon Sep 5 23:53:43 2011 -0400

    1.9.5

 .gitignore |    1 +
 gvfs.spec  |   31 ++++++++++++++++---------------
 sources    |    2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e400cf3..c4ea3fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ gvfs-1.6.3.tar.bz2
 /gvfs-1.9.2.tar.xz
 /gvfs-1.9.3.tar.xz
 /gvfs-1.9.4.tar.xz
+/gvfs-1.9.5.tar.xz
diff --git a/gvfs.spec b/gvfs.spec
index e90d60c..d042529 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,6 +1,6 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.9.4
+Version: 1.9.5
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -57,7 +57,7 @@ required to develop applications using gvfs.
 %package fuse
 Summary: FUSE support for gvfs
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 BuildRequires: fuse-devel
 Requires: fuse
 
@@ -69,7 +69,7 @@ to access the gvfs filesystems.
 %package smb
 Summary: Windows fileshare support for gvfs
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 BuildRequires: libsmbclient-devel >= 3.2.0-1.pre2.8
 BuildRequires: libtalloc-devel >= 1.3.0-0
 
@@ -81,7 +81,7 @@ shares (SMB) to applications using gvfs.
 %package archive
 Summary: Archiving support for gvfs
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 BuildRequires: libarchive-devel >= libarchive-2.7.1-1
 
 %description archive
@@ -92,7 +92,7 @@ as well as ISO images, to applications using gvfs.
 %package obexftp
 Summary: ObexFTP support for gvfs
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: obex-data-server >= 0.3.4-6
 BuildRequires: bluez-libs-devel >= 3.12
 Obsoletes: gnome-vfs2-obexftp <= 0.4
@@ -105,7 +105,7 @@ and devices through ObexFTP to applications using gvfs.
 %package gphoto2
 Summary: gphoto2 support for gvfs
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 BuildRequires: libgphoto2-devel
 BuildRequires: libusb-devel
 BuildRequires: libexif-devel
@@ -119,7 +119,7 @@ media players (Media Transfer Protocol) to applications using gvfs.
 %package afc
 Summary: AFC support for gvfs
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: usbmuxd
 BuildRequires: libimobiledevice-devel >= 0.9.7
 
@@ -131,7 +131,7 @@ including phones and music players to applications using gvfs.
 %package afp
 Summary: AFP support for gvfs
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 BuildRequires: libgcrypt-devel >= 1.2.2
 # this should ensure having this new subpackage installed on upgrade from older versions
 Obsoletes: %{name} < 1.9.4-1
@@ -155,11 +155,12 @@ autoheader  || :
 automake  || :
 autoconf  || :
 
-%configure --enable-gdu --with-bash-completion-dir=%{_sysconfdir}/bash_completion.d/
+%configure \
+        --enable-gdu \
+        --with-bash-completion-dir=%{_sysconfdir}/bash_completion.d/
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -171,16 +172,13 @@ rm $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.la
 /sbin/ldconfig
 # Reload .mount files:
 killall -USR1 gvfsd >&/dev/null || :
-# Update desktop files mime mappings:
 update-desktop-database &> /dev/null || :
-update-gio-modules "$host" &> /dev/null || :
-
+gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules || :
 
 %postun
 /sbin/ldconfig
-# Update desktop files mime mappings:
 update-desktop-database &> /dev/null ||:
-update-gio-modules "$host" &> /dev/null || :
+gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules || :
 if [ $1 -eq 0 ] ; then
     glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 fi
@@ -317,6 +315,9 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/mounts/afp-browse.mount
 
 %changelog
+* Mon Sep  5 2011 Matthias Clasen <mclasen at redhat.com> - 1.9.5-1
+- Update to 1.9.5
+
 * Tue Aug 30 2011 Tomas Bzatek <tbzatek at redhat.com> - 1.9.4-1
 - Update to 1.9.4
 - New AFP backend in separate subpackage
diff --git a/sources b/sources
index 90196c7..074b563 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24d47b4cbcc896bf9a1fb8756e186c8a  gvfs-1.9.4.tar.xz
+2bb1c6a0c900c725a22d8bd99562afde  gvfs-1.9.5.tar.xz