Accepting request 32278 from GNOME:Factory

Copy from GNOME:Factory/gvfs based on submit request 32278 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/32278
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gvfs?expand=0&rev=49

gvfs-1.5.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d67a84228f80570d6f239c1c3527eeb29f844a0cc85dfea09b1d7fb50c639502
-size 1276422

gvfs-1.5.2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e5e740a75087626fd5cb756ca8948a98ee039bddb64a35d076067d0e8df1abd2
+size 1308112

gvfs.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Thu Jan 28 12:13:09 CET 2010 - vuntz@opensuse.org
+
+- Remove en@shaw translation on openSUSE 11.2 and earlier.
+
+-------------------------------------------------------------------
+Mon Jan 25 14:19:37 CET 2010 - vuntz@opensuse.org
+
+- Update to version 1.5.2:
+  + Support new "default location" gio mount attribute
+  + Enable support for lazy loading of gio modules
+  + Don't build hal if building gdu
+  + daemon: Finalize backend on unmount
+  + metadata: stability and leak fixes
+  + metadata: fix data loss on i/o error
+  + fuse: Don't support readlink
+  + fuse: Allow setting mtime
+  + fuse: Fix permissions
+  + smb: Fix free space reporting on some servers
+  + gdu: handle mounts better
+  + trash: Fix crash/assert
+- Use libexecdir instead of libdir. Fix bnc#545011.
+- Remove hal-devel BuildRequires.
+- Use gio-querymodules to update information about gio modules:
+  + add post/postun scriptlets
+  + add Requires(post)/Requires(postun) on glib2 to make sure we
+    have gio-querymodules installed for the scriptlets
+
 -------------------------------------------------------------------
 Wed Dec 23 10:31:35 CET 2009 - vuntz@opensuse.org
 

gvfs.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package gvfs (Version 1.5.1)
+# spec file for package gvfs (Version 1.5.2)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,8 +18,8 @@
 
 
 Name:           gvfs
-Version:        1.5.1
+Version:        1.5.2
-Release:        2
+Release:        1
 # FIXME add libiphone-devel BuildRequires (it's available in the build service, talking to the packager to add it to factory)
 License:        LGPLv2.0+
 Summary:        VFS functionality for GLib
@@ -39,7 +39,6 @@ BuildRequires:  dbus-1-glib-devel
 BuildRequires:  fuse-devel
 BuildRequires:  gconf2-devel
 BuildRequires:  glib2-devel
-BuildRequires:  hal-devel
 BuildRequires:  intltool
 BuildRequires:  libarchive-devel
 BuildRequires:  libavahi-glib-devel
@@ -57,6 +56,9 @@ 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
@@ -117,18 +119,35 @@ translation-update-upstream
 autoreconf -f
 libtoolize -c -f
 %configure \
-    --libexecdir=%{_libdir}/%{name} \
+    --libexecdir=%{_libexecdir}/%{name} \
     --disable-static
 %__make
 
 %install
 %makeinstall
+%if 0%{?suse_version} <= 1120
+%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
+%endif
 rm %{buildroot}%{_libdir}/*.*a
 rm %{buildroot}%{_libdir}/gio/modules/*.*a
 # We can drop the chmod when bgo523420 is fixed.
 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
+
+%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
 
 %postun -n libgvfscommon0 -p /sbin/ldconfig
@@ -145,63 +164,61 @@ rm -rf %{buildroot}
 %dir %{_datadir}/%{name}/mounts
 %dir %{_datadir}/%{name}/remote-volume-monitors
 %{_libdir}/gio/modules/*.so
-%dir %{_libdir}/%{name}
+%dir %{_libexecdir}/%{name}
-%{_libdir}/%{name}/gvfsd
+%{_libexecdir}/%{name}/gvfsd
 %{_sysconfdir}/profile.d/*
 
 %files fuse
 %defattr(-, root, root)
-%{_libdir}/%{name}/gvfs-fuse-daemon
+%{_libexecdir}/%{name}/gvfs-fuse-daemon
 
 %files backends
 %defattr(-, root, root)
 %if %suse_version > 1110
-%{_libdir}/%{name}/gvfs-gdu-volume-monitor
+%{_libexecdir}/%{name}/gvfs-gdu-volume-monitor
 %{_datadir}/%{name}/remote-volume-monitors/gdu.monitor
 %endif
-%{_libdir}/%{name}/gvfs-gphoto2-volume-monitor
+%{_libexecdir}/%{name}/gvfs-gphoto2-volume-monitor
 %{_datadir}/%{name}/remote-volume-monitors/gphoto2.monitor
-%{_libdir}/%{name}/gvfs-hal-volume-monitor
+%{_libexecdir}/%{name}/gvfsd-archive
-%{_datadir}/%{name}/remote-volume-monitors/hal.monitor
-%{_libdir}/%{name}/gvfsd-archive
 %{_datadir}/%{name}/mounts/archive.mount
-%{_libdir}/%{name}/gvfsd-burn
+%{_libexecdir}/%{name}/gvfsd-burn
 %{_datadir}/%{name}/mounts/burn.mount
-%{_libdir}/%{name}/gvfsd-cdda
+%{_libexecdir}/%{name}/gvfsd-cdda
 %{_datadir}/%{name}/mounts/cdda.mount
-%{_libdir}/%{name}/gvfsd-computer
+%{_libexecdir}/%{name}/gvfsd-computer
 %{_datadir}/%{name}/mounts/computer.mount
-%{_libdir}/%{name}/gvfsd-dav
+%{_libexecdir}/%{name}/gvfsd-dav
 %{_datadir}/%{name}/mounts/dav.mount
 %{_datadir}/%{name}/mounts/dav+sd.mount
-%{_libdir}/%{name}/gvfsd-dice
+%{_libexecdir}/%{name}/gvfsd-dice
 %{_datadir}/%{name}/mounts/dice.mount
-%{_libdir}/%{name}/gvfsd-dnssd
+%{_libexecdir}/%{name}/gvfsd-dnssd
 %{_datadir}/%{name}/mounts/dns-sd.mount
-%{_libdir}/%{name}/gvfsd-ftp
+%{_libexecdir}/%{name}/gvfsd-ftp
 %{_datadir}/%{name}/mounts/ftp.mount
-%{_libdir}/%{name}/gvfsd-gphoto2
+%{_libexecdir}/%{name}/gvfsd-gphoto2
 %{_datadir}/%{name}/mounts/gphoto2.mount
-%{_libdir}/%{name}/gvfsd-http
+%{_libexecdir}/%{name}/gvfsd-http
 %{_datadir}/%{name}/mounts/http.mount
-%{_libdir}/%{name}/gvfsd-localtest
+%{_libexecdir}/%{name}/gvfsd-localtest
 %{_datadir}/%{name}/mounts/localtest.mount
-%{_libdir}/%{name}/gvfsd-metadata
+%{_libexecdir}/%{name}/gvfsd-metadata
-%{_libdir}/%{name}/gvfsd-nds
+%{_libexecdir}/%{name}/gvfsd-nds
 %{_datadir}/%{name}/mounts/nds.mount
-%{_libdir}/%{name}/gvfsd-network
+%{_libexecdir}/%{name}/gvfsd-network
 %{_datadir}/%{name}/mounts/network.mount
-%{_libdir}/%{name}/gvfsd-nvvfs
+%{_libexecdir}/%{name}/gvfsd-nvvfs
 %{_datadir}/%{name}/mounts/nvvfs.mount
-%{_libdir}/%{name}/gvfsd-obexftp
+%{_libexecdir}/%{name}/gvfsd-obexftp
 %{_datadir}/%{name}/mounts/obexftp.mount
-%{_libdir}/%{name}/gvfsd-sftp
+%{_libexecdir}/%{name}/gvfsd-sftp
 %{_datadir}/%{name}/mounts/sftp.mount
-%{_libdir}/%{name}/gvfsd-smb
+%{_libexecdir}/%{name}/gvfsd-smb
 %{_datadir}/%{name}/mounts/smb.mount
-%{_libdir}/%{name}/gvfsd-smb-browse
+%{_libexecdir}/%{name}/gvfsd-smb-browse
 %{_datadir}/%{name}/mounts/smb-browse.mount
-%{_libdir}/%{name}/gvfsd-trash
+%{_libexecdir}/%{name}/gvfsd-trash
 %{_datadir}/%{name}/mounts/trash.mount
 
 %files -n libgvfscommon0