From 3da162a3713a1f5ad37c8510072e61b107d00c68f48bdcf370ff57e35d844128 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 14 Feb 2010 17:37:13 +0000 Subject: [PATCH 1/3] Accepting request 32389 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/gvfs via accept of submit request 32389 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/32389 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=66 --- gvfs-1.5.2.tar.bz2 | 3 --- gvfs-1.5.3.tar.bz2 | 3 +++ gvfs.changes | 10 ++++++++++ gvfs.spec | 6 +++--- 4 files changed, 16 insertions(+), 6 deletions(-) delete mode 100644 gvfs-1.5.2.tar.bz2 create mode 100644 gvfs-1.5.3.tar.bz2 diff --git a/gvfs-1.5.2.tar.bz2 b/gvfs-1.5.2.tar.bz2 deleted file mode 100644 index bdc7a5c..0000000 --- a/gvfs-1.5.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5e740a75087626fd5cb756ca8948a98ee039bddb64a35d076067d0e8df1abd2 -size 1308112 diff --git a/gvfs-1.5.3.tar.bz2 b/gvfs-1.5.3.tar.bz2 new file mode 100644 index 0000000..cbf7a68 --- /dev/null +++ b/gvfs-1.5.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1da0a375801eead6e589a86d7b38916d4770a09cf12c926e081f8c47a33d43d6 +size 1299775 diff --git a/gvfs.changes b/gvfs.changes index 5bdb859..982ace3 100644 --- a/gvfs.changes +++ b/gvfs.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Feb 12 14:17:13 CET 2010 - dimstar@opensuse.org + +- Update to version 1.5.3: + + afc: Update for libimobiledevice (rename of libiphone) + + ftp: Handle cases where symlink target is not defined + + ftp: Prefer PASV/PORT to EPSV/EPRT for IPv4, the latter for + IPv6 + + Translation updates. + ------------------------------------------------------------------- Thu Jan 28 12:13:09 CET 2010 - vuntz@opensuse.org diff --git a/gvfs.spec b/gvfs.spec index c3e9a74..06b120e 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -1,5 +1,5 @@ # -# spec file for package gvfs (Version 1.5.2) +# spec file for package gvfs (Version 1.5.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,9 +18,9 @@ Name: gvfs -Version: 1.5.2 +Version: 1.5.3 Release: 1 -# FIXME add libiphone-devel BuildRequires (it's available in the build service, talking to the packager to add it to factory) +# FIXME add libimobiledevice-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 Url: http://www.gnome.org From 52200893210355a7050d78a5c9bc52533dac222595f588f64550c3ea5933b693 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 14 Feb 2010 17:47:13 +0000 Subject: [PATCH 2/3] Accepting request 32542 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gvfs via accept of submit request 32542 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/32542 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=67 --- gvfs-no-querymodule-on-install.patch | 28 ++++++++++++++++++++++++++++ gvfs.changes | 5 +++++ gvfs.spec | 3 +++ 3 files changed, 36 insertions(+) create mode 100644 gvfs-no-querymodule-on-install.patch diff --git a/gvfs-no-querymodule-on-install.patch b/gvfs-no-querymodule-on-install.patch new file mode 100644 index 0000000..09a9196 --- /dev/null +++ b/gvfs-no-querymodule-on-install.patch @@ -0,0 +1,28 @@ +From f609ecec4e8c23659cbd0ebd4c7357d2969dc7cc Mon Sep 17 00:00:00 2001 +From: Vincent Untz +Date: Sun, 14 Feb 2010 18:38:04 +0100 +Subject: [PATCH] Do not call gio-querymodules on install when DESTDIR is set + +This is a bug introduced in a18a1896c0bceaf9a467f00a9678e322d615e786. We +want to call gio-querymodules on install, except when building a +package. +--- + Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 4dde338..25f939a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -33,7 +33,7 @@ distclean-local: + fi + + install-data-hook: +- if test ! -z "$(DESTDIR)" -a "$(GIO_QUERYMODULES)" != "no" ; then \ ++ if test -z "$(DESTDIR)" -a "$(GIO_QUERYMODULES)" != "no" ; then \ + $(GIO_QUERYMODULES) $(DESTDIR)$(giomodulesdir) ; \ + fi + +-- +1.6.6.1 + diff --git a/gvfs.changes b/gvfs.changes index 982ace3..e0f061d 100644 --- a/gvfs.changes +++ b/gvfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 14 18:39:40 CET 2010 - vuntz@opensuse.org + +- Add gvfs-no-querymodule-on-install.patch to fix build. + ------------------------------------------------------------------- Fri Feb 12 14:17:13 CET 2010 - dimstar@opensuse.org diff --git a/gvfs.spec b/gvfs.spec index 06b120e..0c46783 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -26,6 +26,8 @@ Summary: VFS functionality for GLib Url: http://www.gnome.org Group: Development/Libraries/C and C++ Source0: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM gvfs-no-querymodule-on-install.patch bgo609927 vuntz@opensuse.org -- Do not call gio-querymodules on make install +Patch0: gvfs-no-querymodule-on-install.patch # 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. @@ -110,6 +112,7 @@ VFS functionality for GLib. %prep %setup -q translation-update-upstream +%patch0 -p1 %patch1 -p1 %patch4 -p1 %patch5 -p1 From 663108c81fb9da3cd2aaffa82f5c71c420aeaaec21b2119b441182900f1539cf Mon Sep 17 00:00:00 2001 From: Magnus Boman Date: Sun, 28 Feb 2010 08:17:57 +0000 Subject: [PATCH 3/3] Accepting request 33506 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/gvfs via accept of submit request 33506 revision 3. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/33506 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=69 --- gvfs-1.5.3.tar.bz2 | 3 --- gvfs-1.5.4.tar.bz2 | 3 +++ gvfs-429959-handle-blank-schemas.patch | 10 ++++---- gvfs-dice-backend.patch | 32 +++++++++++++------------- gvfs-nds.patch | 32 +++++++++++++++----------- gvfs-no-querymodule-on-install.patch | 28 ---------------------- gvfs.changes | 16 +++++++++++++ gvfs.spec | 7 ++---- 8 files changed, 60 insertions(+), 71 deletions(-) delete mode 100644 gvfs-1.5.3.tar.bz2 create mode 100644 gvfs-1.5.4.tar.bz2 delete mode 100644 gvfs-no-querymodule-on-install.patch diff --git a/gvfs-1.5.3.tar.bz2 b/gvfs-1.5.3.tar.bz2 deleted file mode 100644 index cbf7a68..0000000 --- a/gvfs-1.5.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1da0a375801eead6e589a86d7b38916d4770a09cf12c926e081f8c47a33d43d6 -size 1299775 diff --git a/gvfs-1.5.4.tar.bz2 b/gvfs-1.5.4.tar.bz2 new file mode 100644 index 0000000..33d67bf --- /dev/null +++ b/gvfs-1.5.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7e23851681875a04bd6697657433a204be9e6895a845ca3cb5ee573ca17ab02 +size 1333291 diff --git a/gvfs-429959-handle-blank-schemas.patch b/gvfs-429959-handle-blank-schemas.patch index 5c90fa0..e4d3973 100644 --- a/gvfs-429959-handle-blank-schemas.patch +++ b/gvfs-429959-handle-blank-schemas.patch @@ -1,8 +1,8 @@ -diff --git a/gconf/gapplookupgconf.c b/gconf/gapplookupgconf.c -index 059659d..75e3b32 100644 ---- a/gconf/gapplookupgconf.c -+++ b/gconf/gapplookupgconf.c -@@ -114,6 +114,9 @@ get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup, +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; diff --git a/gvfs-dice-backend.patch b/gvfs-dice-backend.patch index b3f21b5..cc601df 100644 --- a/gvfs-dice-backend.patch +++ b/gvfs-dice-backend.patch @@ -1,8 +1,8 @@ -Index: gvfs-1.5.1/configure.ac +Index: gvfs-1.5.4/configure.ac =================================================================== ---- gvfs-1.5.1.orig/configure.ac -+++ gvfs-1.5.1/configure.ac -@@ -46,6 +46,10 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.21 +--- gvfs-1.5.4.orig/configure.ac ++++ gvfs-1.5.4/configure.ac +@@ -47,6 +47,10 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.23 PKG_CHECK_MODULES(DBUS, dbus-1) @@ -10,13 +10,13 @@ Index: gvfs-1.5.1/configure.ac +AC_SUBST(DBUS_GLIB_CFLAGS) +AC_SUBST(DBUS_GLIB_LIBS) + - AC_ARG_WITH(dbus_service_dir, [ --with-dbus-service-dir=PATH choose directory for dbus service files, [default=PREFIX/share/dbus-1/services]], with_dbus_service_dir="$withval", with_dbus_service_dir=$datadir/dbus-1/services) - DBUS_SERVICE_DIR=$with_dbus_service_dir - AC_SUBST(DBUS_SERVICE_DIR) -Index: gvfs-1.5.1/daemon/dice.mount.in + AC_ARG_WITH(dbus_service_dir, + AS_HELP_STRING([--with-dbus-service-dir=PATH],[choose directory for dbus service files]), + [default=PREFIX/share/dbus-1/services]], with_dbus_service_dir="$withval", with_dbus_service_dir=$datadir/dbus-1/services) +Index: gvfs-1.5.4/daemon/dice.mount.in =================================================================== --- /dev/null -+++ gvfs-1.5.1/daemon/dice.mount.in ++++ gvfs-1.5.4/daemon/dice.mount.in @@ -0,0 +1,6 @@ +[Mount] +Type=dice @@ -24,10 +24,10 @@ Index: gvfs-1.5.1/daemon/dice.mount.in +AutoMount=true +DBusName=org.gtk.vfs.mountpoint.dice + -Index: gvfs-1.5.1/daemon/gvfsbackenddice.c +Index: gvfs-1.5.4/daemon/gvfsbackenddice.c =================================================================== --- /dev/null -+++ gvfs-1.5.1/daemon/gvfsbackenddice.c ++++ gvfs-1.5.4/daemon/gvfsbackenddice.c @@ -0,0 +1,1989 @@ +/* Novell DICE Backend for GVfs + * @@ -2018,10 +2018,10 @@ Index: gvfs-1.5.1/daemon/gvfsbackenddice.c +// backend_class->create_dir_monitor = do_create_dir_monitor; +// backend_class->create_file_monitor = do_create_file_monitor; +} -Index: gvfs-1.5.1/daemon/gvfsbackenddice.h +Index: gvfs-1.5.4/daemon/gvfsbackenddice.h =================================================================== --- /dev/null -+++ gvfs-1.5.1/daemon/gvfsbackenddice.h ++++ gvfs-1.5.4/daemon/gvfsbackenddice.h @@ -0,0 +1,50 @@ +/* Novell IceDesktop Backend for GVfs + * @@ -2073,10 +2073,10 @@ Index: gvfs-1.5.1/daemon/gvfsbackenddice.h +G_END_DECLS + +#endif /* __G_VFS_BACKEND_DICE_H__ */ -Index: gvfs-1.5.1/daemon/Makefile.am +Index: gvfs-1.5.4/daemon/Makefile.am =================================================================== ---- gvfs-1.5.1.orig/daemon/Makefile.am -+++ gvfs-1.5.1/daemon/Makefile.am +--- gvfs-1.5.4.orig/daemon/Makefile.am ++++ gvfs-1.5.4/daemon/Makefile.am @@ -10,6 +10,7 @@ INCLUDES = \ -I$(top_srcdir)/common \ -I$(top_builddir) \ diff --git a/gvfs-nds.patch b/gvfs-nds.patch index bfe02f7..4e6ca20 100644 --- a/gvfs-nds.patch +++ b/gvfs-nds.patch @@ -1,6 +1,7 @@ -diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnds.c gvfs-1.2.0/daemon/gvfsbackendnds.c ---- gvfs-1.2.0.orig/daemon/gvfsbackendnds.c 1970-01-01 05:30:00.000000000 +0530 -+++ gvfs-1.2.0/daemon/gvfsbackendnds.c 2009-04-03 20:14:07.000000000 +0530 +Index: gvfs-1.5.4/daemon/gvfsbackendnds.c +=================================================================== +--- /dev/null ++++ gvfs-1.5.4/daemon/gvfsbackendnds.c @@ -0,0 +1,753 @@ +/* GIO - GLib Input, Output and Streaming Library + * @@ -755,9 +756,10 @@ diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnds.c gvfs-1.2.0/daemon/gvfsbackend +{ + g_set_application_name (_("Displaying Embedded Objects")); +} -diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnds.h gvfs-1.2.0/daemon/gvfsbackendnds.h ---- gvfs-1.2.0.orig/daemon/gvfsbackendnds.h 1970-01-01 05:30:00.000000000 +0530 -+++ gvfs-1.2.0/daemon/gvfsbackendnds.h 2009-04-03 19:51:07.000000000 +0530 +Index: gvfs-1.5.4/daemon/gvfsbackendnds.h +=================================================================== +--- /dev/null ++++ gvfs-1.5.4/daemon/gvfsbackendnds.h @@ -0,0 +1,53 @@ +/* GIO - GLib Input, Output and Streaming Library + * @@ -812,10 +814,11 @@ diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnds.h gvfs-1.2.0/daemon/gvfsbackend +G_END_DECLS + +#endif /* __G_VFS_BACKEND_NDS_H__ */ -diff -Nupr gvfs-1.2.0.orig/daemon/Makefile.am gvfs-1.2.0/daemon/Makefile.am ---- gvfs-1.2.0.orig/daemon/Makefile.am 2009-04-03 20:08:22.000000000 +0530 -+++ gvfs-1.2.0/daemon/Makefile.am 2009-04-03 19:51:07.000000000 +0530 -@@ -105,6 +105,10 @@ mount_in_files += nvvfs.mount.in +Index: gvfs-1.5.4/daemon/Makefile.am +=================================================================== +--- gvfs-1.5.4.orig/daemon/Makefile.am ++++ gvfs-1.5.4/daemon/Makefile.am +@@ -112,6 +112,10 @@ mount_in_files += nvvfs.mount.in mount_DATA += nvvfs.mount libexec_PROGRAMS += gvfsd-nvvfs @@ -826,7 +829,7 @@ diff -Nupr gvfs-1.2.0.orig/daemon/Makefile.am gvfs-1.2.0/daemon/Makefile.am EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list DISTCLEANFILES = gvfs-daemon.service $(mount_DATA) -@@ -406,6 +410,19 @@ gvfsd_http_CPPFLAGS = \ +@@ -442,6 +446,19 @@ gvfsd_http_CPPFLAGS = \ gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS) @@ -846,9 +849,10 @@ diff -Nupr gvfs-1.2.0.orig/daemon/Makefile.am gvfs-1.2.0/daemon/Makefile.am gvfsd_nvvfs_SOURCES = \ gvfsbackendnvvfs.c gvfsbackendnvvfs.h \ daemon-main.c daemon-main.h \ -diff -Nupr gvfs-1.2.0.orig/daemon/nds.mount.in gvfs-1.2.0/daemon/nds.mount.in ---- gvfs-1.2.0.orig/daemon/nds.mount.in 1970-01-01 05:30:00.000000000 +0530 -+++ gvfs-1.2.0/daemon/nds.mount.in 2009-04-03 19:51:07.000000000 +0530 +Index: gvfs-1.5.4/daemon/nds.mount.in +=================================================================== +--- /dev/null ++++ gvfs-1.5.4/daemon/nds.mount.in @@ -0,0 +1,5 @@ +[Mount] +Type=nds diff --git a/gvfs-no-querymodule-on-install.patch b/gvfs-no-querymodule-on-install.patch deleted file mode 100644 index 09a9196..0000000 --- a/gvfs-no-querymodule-on-install.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f609ecec4e8c23659cbd0ebd4c7357d2969dc7cc Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Sun, 14 Feb 2010 18:38:04 +0100 -Subject: [PATCH] Do not call gio-querymodules on install when DESTDIR is set - -This is a bug introduced in a18a1896c0bceaf9a467f00a9678e322d615e786. We -want to call gio-querymodules on install, except when building a -package. ---- - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 4dde338..25f939a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -33,7 +33,7 @@ distclean-local: - fi - - install-data-hook: -- if test ! -z "$(DESTDIR)" -a "$(GIO_QUERYMODULES)" != "no" ; then \ -+ if test -z "$(DESTDIR)" -a "$(GIO_QUERYMODULES)" != "no" ; then \ - $(GIO_QUERYMODULES) $(DESTDIR)$(giomodulesdir) ; \ - fi - --- -1.6.6.1 - diff --git a/gvfs.changes b/gvfs.changes index e0f061d..7250803 100644 --- a/gvfs.changes +++ b/gvfs.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Feb 24 12:15:22 CET 2010 - dimstar@opensuse.org + +- Update to version 1.5.4: + + gphoto2: Better support for devices that are read-only + delete + + gdu: Various fixes and preparation for LVM + + ftp: fix asserts + + sftp: remember to save password if username changed + + gio module: don't call g_file_find_enclosing_mount_async + callback directly + + gvfs-monitor: Track moves if availible + + Translation updates +- Rebase gvfs-dice-backend.patch, gvfs-nds.patch and + gvfs-429959-handle-blank-schemas.patch +- Drop gvfs-no-querymodule-on-install.patch, upstream included. + ------------------------------------------------------------------- Sun Feb 14 18:39:40 CET 2010 - vuntz@opensuse.org diff --git a/gvfs.spec b/gvfs.spec index 0c46783..a00b409 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -1,5 +1,5 @@ # -# spec file for package gvfs (Version 1.5.3) +# spec file for package gvfs (Version 1.5.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: gvfs -Version: 1.5.3 +Version: 1.5.4 Release: 1 # FIXME add libimobiledevice-devel BuildRequires (it's available in the build service, talking to the packager to add it to factory) License: LGPLv2.0+ @@ -26,8 +26,6 @@ Summary: VFS functionality for GLib Url: http://www.gnome.org Group: Development/Libraries/C and C++ Source0: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM gvfs-no-querymodule-on-install.patch bgo609927 vuntz@opensuse.org -- Do not call gio-querymodules on make install -Patch0: gvfs-no-querymodule-on-install.patch # 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. @@ -112,7 +110,6 @@ VFS functionality for GLib. %prep %setup -q translation-update-upstream -%patch0 -p1 %patch1 -p1 %patch4 -p1 %patch5 -p1