diff --git a/gvfs-1.6.4.tar.bz2 b/gvfs-1.6.4.tar.bz2 deleted file mode 100644 index a0754d9..0000000 --- a/gvfs-1.6.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1e2810678b42cb0160642f0cd33ccd377cddfb18fc868d6faa04c449f813693 -size 1385999 diff --git a/gvfs-1.6.6.tar.bz2 b/gvfs-1.6.6.tar.bz2 new file mode 100644 index 0000000..f050482 --- /dev/null +++ b/gvfs-1.6.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:902890deb6a670f642180ea958406ebb02af1d5867a464c87e493d56f1dde7bd +size 1387796 diff --git a/gvfs-429959-handle-blank-schemas.patch b/gvfs-429959-handle-blank-schemas.patch deleted file mode 100644 index e4d3973..0000000 --- a/gvfs-429959-handle-blank-schemas.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: gvfs-1.5.4/gconf/gapplookupgconf.c -=================================================================== ---- gvfs-1.5.4.orig/gconf/gapplookupgconf.c -+++ gvfs-1.5.4/gconf/gapplookupgconf.c -@@ -107,6 +107,9 @@ get_default_for_uri_scheme (GDesktopAppI - - appinfo = NULL; - -+ if (uri_scheme == NULL || *uri_scheme == '\0') -+ uri_scheme = "unknown"; -+ - client = gconf_client_get_default (); - - command_key = g_strconcat (GCONF_PATH_PREFIX, diff --git a/gvfs-glib-2.27.patch b/gvfs-glib-2.27.patch new file mode 100644 index 0000000..160eb52 --- /dev/null +++ b/gvfs-glib-2.27.patch @@ -0,0 +1,50 @@ +commit 6115bf7549fc2a9171d7cd5eaec6bc1a58dfb8b2 +Author: Vincent Untz +Date: Fri Nov 19 10:00:36 2010 +0100 + + Do not build app lookup extension if we have glib >= 2.27.1 + + https://bugzilla.gnome.org/show_bug.cgi?id=635252 + +diff --git a/configure.ac b/configure.ac +index ed70e54..5f05f57 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -213,6 +213,14 @@ fi + + AM_CONDITIONAL(USE_GCONF, [test "$msg_gconf" = "yes"]) + ++dnl ************************************************************* ++dnl *** Check if we can build gconf-based gio extension point *** ++dnl ************************************************************* ++ ++msg_gconf_gio=no ++PKG_CHECK_EXISTS(gio-2.0 <= 2.27.1, msg_gconf_gio=yes) ++AM_CONDITIONAL(USE_GCONF_GIO, [test "$msg_gconf_gio" = "yes"]) ++ + dnl ******************************************** + dnl *** Check for expat (for obexftp and gdu *** + dnl ******************************************** +@@ -726,6 +734,7 @@ echo " + archive support: $msg_archive + AFC support: $msg_afc + GConf support: $msg_gconf ++ GConf-based GIO extension: $msg_gconf_gio + DNS-SD support: $msg_avahi + Build HAL volume monitor: $msg_hal (with fast init path: $have_hal_fast_init) + Build GDU volume monitor: $msg_gdu +diff --git a/gconf/Makefile.am b/gconf/Makefile.am +index 85d4d8d..af1433e 100644 +--- a/gconf/Makefile.am ++++ b/gconf/Makefile.am +@@ -4,8 +4,10 @@ NULL = + module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)' + + if USE_GCONF ++if USE_GCONF_GIO + giomodules_LTLIBRARIES = libgiogconf.la + endif ++endif + + libgiogconf_la_SOURCES = \ + gapplookupgconf.c gapplookupgconf.h \ diff --git a/gvfs.changes b/gvfs.changes index d1c8ef4..c0415fe 100644 --- a/gvfs.changes +++ b/gvfs.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Fri Nov 19 10:07:00 CET 2010 - vuntz@opensuse.org + +- Add gvfs-glib-2.27.patch: only build the app lookup extension for + glib <= 2.27.1, else the build fails. + +------------------------------------------------------------------- +Mon Nov 15 11:35:14 CET 2010 - dimstar@opensuse.org + +- Update to version 1.6.6: + + Revert removal of app lookup extension for stable Gnome 2.32 + line + + sftp: Close pty master in child process to prevent selinux + denials + + fuse: Add O_TRUNC support for open() to prevent data loss. + +------------------------------------------------------------------- +Fri Nov 5 19:05:35 CET 2010 - vuntz@opensuse.org + +- Update to version 1.6.5: + + Remove app lookup extension (now handled internally in GIO) + + gphoto: Use correct address for GPhoto mounts with gudev + + sftp: Fix poll() timeout +- Drop gvfs-429959-handle-blank-schemas.patch: this was removed + since schemas are now handled in GIO directly. + ------------------------------------------------------------------- Mon Oct 11 21:32:43 CEST 2010 - vuntz@opensuse.org diff --git a/gvfs.spec b/gvfs.spec index 1988a9b..7c751c1 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -1,5 +1,5 @@ # -# spec file for package gvfs (Version 1.6.4) +# spec file for package gvfs (Version 1.6.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: gvfs -Version: 1.6.4 +Version: 1.6.6 Release: 1 License: LGPLv2.0+ Summary: VFS functionality for GLib @@ -28,12 +28,12 @@ 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. -Patch4: gvfs-429959-handle-blank-schemas.patch # PATCH-FEATURE-OPENSUSE gvfs-nvvfs.patch ksamrat@novell.com -- Provides gvfs backend for novell nautilus plugin Patch5: gvfs-nvvfs.patch # PATCH-FEATURE-OPENSUSE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus Patch6: gvfs-nds.patch +# PATCH-FIX-UPSTREAM gvfs-glib-2.27.patch bgo#635252 vuntz@opensuse.org -- Fix build with recent glib +Patch7: gvfs-glib-2.27.patch BuildRequires: bluez-devel BuildRequires: dbus-1-glib-devel BuildRequires: fuse-devel @@ -119,9 +119,9 @@ VFS functionality for GLib. %setup -q translation-update-upstream %patch1 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build autoreconf -f