Accepting request 105130 from GNOME:Factory

Pushing most G:F bits

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

gvfs-1.11.2.tar.xz

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

gvfs-1.11.3.tar.xz

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

gvfs.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Tue Feb  7 15:17:07 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 1.11.3:
+  + Brand new udisks2 volume monitor
+  + AFP backend fixes and enhancements
+  + User runtime dir is now used for gvfs mounts and the burn
+    backend
+  + Fixed backends segfaulting on unmount
+  + Updated translations.
+- Remove xz BuildRequires now that it comes for free in the build
+  system.
+- Get ready for switch to udisks2:
+  + Add a with_udisk2 macro, currently set to 0 as udisk2 is still
+    waiting for security review (bnc#742751).
+  + This will enable the use of the udisks2 volume monitor, instead
+    of the gdu volume monitor.
+  + If with_udisk2 is set to 1:
+    - Use pkgconfig(udisks2) BuildRequires.
+    - Pass --enable-udisks2 --disable-gdu to configure.
+  + If with_udisk2 is set to 0:
+    - Use libgdu-devel BuildRequires.
+    - Pass --disable-udisks2 --enable-gdu to configure.
+
 -------------------------------------------------------------------
 Wed Jan 18 17:43:27 UTC 2012 - vuntz@opensuse.org
 

gvfs.spec

@@ -16,8 +16,10 @@
 #
 
 
+%define with_udisks2 0
+
 Name:           gvfs
-Version:        1.11.2
+Version:        1.11.3
 Release:        0
 Summary:        VFS functionality for GLib
 License:        LGPL-2.0+
@@ -39,7 +41,9 @@ BuildRequires:  libavahi-glib-devel
 BuildRequires:  libcdio-devel
 BuildRequires:  libexpat-devel
 BuildRequires:  libgcrypt-devel
+%if !%{with_udisks2}
 BuildRequires:  libgdu-devel
+%endif
 BuildRequires:  libgnome-keyring-devel
 BuildRequires:  libgphoto2-devel
 BuildRequires:  libgudev-1_0-devel
@@ -49,9 +53,10 @@ BuildRequires:  libsoup-devel
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  translation-update-upstream
-# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
-BuildRequires:  xz
 BuildRequires:  pkgconfig(libbluray)
+%if %{with_udisks2}
+BuildRequires:  pkgconfig(udisks2) >= 1.90
+%endif
 Requires:       libgvfscommon0 = %{version}
 Recommends:     %{name}-lang
 Recommends:     gvfs-backends
@@ -124,14 +129,18 @@ libtoolize -c -f
 %build
 %configure \
     --libexecdir=%{_libexecdir}/%{name} \
+%if %{with_udisks2}
+    --enable-udisks2 \
+    --disable-gdu \
+%else
+    --disable-udisks2 \
+    --enable-gdu \
+%endif
     --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.
@@ -186,7 +195,7 @@ rm -rf %{buildroot}
 
 %files backends
 %defattr(-, root, root)
-%if 0%{suse_version} > 1110
+%if !%{with_udisks2}
 %{_libexecdir}/%{name}/gvfs-gdu-volume-monitor
 %{_datadir}/dbus-1/services/org.gtk.Private.GduVolumeMonitor.service
 %{_datadir}/%{name}/remote-volume-monitors/gdu.monitor