From 68cb5f2678a015963ba9a4796b1829b824b76fb93339a96c8b9df9839416df36 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 17 Mar 2010 13:06:39 +0000 Subject: [PATCH 1/2] Accepting request 34995 from GNOME:Factory checked in (request 34995) OBS-URL: https://build.opensuse.org/request/show/34995 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=72 --- gvfs-1.5.4.tar.bz2 | 3 +++ gvfs-1.5.5.tar.bz2 | 3 --- gvfs-dice-backend.patch | 28 ++++++++++++++-------------- gvfs.changes | 11 ----------- gvfs.spec | 4 ++-- 5 files changed, 19 insertions(+), 30 deletions(-) create mode 100644 gvfs-1.5.4.tar.bz2 delete mode 100644 gvfs-1.5.5.tar.bz2 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-1.5.5.tar.bz2 b/gvfs-1.5.5.tar.bz2 deleted file mode 100644 index 612f53e..0000000 --- a/gvfs-1.5.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6c3c54ddbf5be75836e69c6d847500201b1b95b54d9bea8f9f51d2bc9617c8a -size 1310788 diff --git a/gvfs-dice-backend.patch b/gvfs-dice-backend.patch index 4d1ec7e..cc601df 100644 --- a/gvfs-dice-backend.patch +++ b/gvfs-dice-backend.patch @@ -1,7 +1,7 @@ -Index: gvfs-1.5.5/configure.ac +Index: gvfs-1.5.4/configure.ac =================================================================== ---- gvfs-1.5.5.orig/configure.ac -+++ gvfs-1.5.5/configure.ac +--- 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) @@ -11,12 +11,12 @@ Index: gvfs-1.5.5/configure.ac +AC_SUBST(DBUS_GLIB_LIBS) + 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.5/daemon/dice.mount.in + 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.5/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.5/daemon/dice.mount.in +AutoMount=true +DBusName=org.gtk.vfs.mountpoint.dice + -Index: gvfs-1.5.5/daemon/gvfsbackenddice.c +Index: gvfs-1.5.4/daemon/gvfsbackenddice.c =================================================================== --- /dev/null -+++ gvfs-1.5.5/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.5/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.5/daemon/gvfsbackenddice.h +Index: gvfs-1.5.4/daemon/gvfsbackenddice.h =================================================================== --- /dev/null -+++ gvfs-1.5.5/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.5/daemon/gvfsbackenddice.h +G_END_DECLS + +#endif /* __G_VFS_BACKEND_DICE_H__ */ -Index: gvfs-1.5.5/daemon/Makefile.am +Index: gvfs-1.5.4/daemon/Makefile.am =================================================================== ---- gvfs-1.5.5.orig/daemon/Makefile.am -+++ gvfs-1.5.5/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.changes b/gvfs.changes index 58a6296..7250803 100644 --- a/gvfs.changes +++ b/gvfs.changes @@ -1,14 +1,3 @@ -------------------------------------------------------------------- -Mon Mar 8 17:28:55 CET 2010 - dimstar@opensuse.org - -- Update to version 1.5.5: - + Fix with-dbus-service-dir configure switch - + ftp: Cleanup (close the data connection unconditionally) - + archive: Use archive_errno() the correct way - + Correct return values on error for programs - + Translation updates. -- Rebase gvfs-dice-backend.patch. - ------------------------------------------------------------------- Wed Feb 24 12:15:22 CET 2010 - dimstar@opensuse.org diff --git a/gvfs.spec b/gvfs.spec index 555a8ba..a00b409 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -1,5 +1,5 @@ # -# spec file for package gvfs (Version 1.5.5) +# 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.5 +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+ From 55ecdcdbc3f1de63a6137d6e3c669bbd6ffdde65f11ed3c38f1dc361da481955 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 29 Mar 2010 11:24:01 +0000 Subject: [PATCH 2/2] Accepting request 35952 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gvfs via accept of submit request 35952 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/35952 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=73 --- gvfs-1.5.4.tar.bz2 | 3 --- gvfs-1.6.0.tar.bz2 | 3 +++ gvfs-dice-backend.patch | 28 ++++++++++++++-------------- gvfs.changes | 19 +++++++++++++++++++ gvfs.spec | 4 ++-- ready | 0 6 files changed, 38 insertions(+), 19 deletions(-) delete mode 100644 gvfs-1.5.4.tar.bz2 create mode 100644 gvfs-1.6.0.tar.bz2 delete mode 100644 ready diff --git a/gvfs-1.5.4.tar.bz2 b/gvfs-1.5.4.tar.bz2 deleted file mode 100644 index 33d67bf..0000000 --- a/gvfs-1.5.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7e23851681875a04bd6697657433a204be9e6895a845ca3cb5ee573ca17ab02 -size 1333291 diff --git a/gvfs-1.6.0.tar.bz2 b/gvfs-1.6.0.tar.bz2 new file mode 100644 index 0000000..1c47466 --- /dev/null +++ b/gvfs-1.6.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e4c973e75c7af8d2d88232cd7742971f655fdbd7f5b687450b858484d88a0d3 +size 1352935 diff --git a/gvfs-dice-backend.patch b/gvfs-dice-backend.patch index cc601df..4d1ec7e 100644 --- a/gvfs-dice-backend.patch +++ b/gvfs-dice-backend.patch @@ -1,7 +1,7 @@ -Index: gvfs-1.5.4/configure.ac +Index: gvfs-1.5.5/configure.ac =================================================================== ---- gvfs-1.5.4.orig/configure.ac -+++ gvfs-1.5.4/configure.ac +--- gvfs-1.5.5.orig/configure.ac ++++ gvfs-1.5.5/configure.ac @@ -47,6 +47,10 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.23 PKG_CHECK_MODULES(DBUS, dbus-1) @@ -11,12 +11,12 @@ Index: gvfs-1.5.4/configure.ac +AC_SUBST(DBUS_GLIB_LIBS) + 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 + 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.5/daemon/dice.mount.in =================================================================== --- /dev/null -+++ gvfs-1.5.4/daemon/dice.mount.in ++++ gvfs-1.5.5/daemon/dice.mount.in @@ -0,0 +1,6 @@ +[Mount] +Type=dice @@ -24,10 +24,10 @@ Index: gvfs-1.5.4/daemon/dice.mount.in +AutoMount=true +DBusName=org.gtk.vfs.mountpoint.dice + -Index: gvfs-1.5.4/daemon/gvfsbackenddice.c +Index: gvfs-1.5.5/daemon/gvfsbackenddice.c =================================================================== --- /dev/null -+++ gvfs-1.5.4/daemon/gvfsbackenddice.c ++++ gvfs-1.5.5/daemon/gvfsbackenddice.c @@ -0,0 +1,1989 @@ +/* Novell DICE Backend for GVfs + * @@ -2018,10 +2018,10 @@ Index: gvfs-1.5.4/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.4/daemon/gvfsbackenddice.h +Index: gvfs-1.5.5/daemon/gvfsbackenddice.h =================================================================== --- /dev/null -+++ gvfs-1.5.4/daemon/gvfsbackenddice.h ++++ gvfs-1.5.5/daemon/gvfsbackenddice.h @@ -0,0 +1,50 @@ +/* Novell IceDesktop Backend for GVfs + * @@ -2073,10 +2073,10 @@ Index: gvfs-1.5.4/daemon/gvfsbackenddice.h +G_END_DECLS + +#endif /* __G_VFS_BACKEND_DICE_H__ */ -Index: gvfs-1.5.4/daemon/Makefile.am +Index: gvfs-1.5.5/daemon/Makefile.am =================================================================== ---- gvfs-1.5.4.orig/daemon/Makefile.am -+++ gvfs-1.5.4/daemon/Makefile.am +--- gvfs-1.5.5.orig/daemon/Makefile.am ++++ gvfs-1.5.5/daemon/Makefile.am @@ -10,6 +10,7 @@ INCLUDES = \ -I$(top_srcdir)/common \ -I$(top_builddir) \ diff --git a/gvfs.changes b/gvfs.changes index 7250803..052f7af 100644 --- a/gvfs.changes +++ b/gvfs.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Mar 29 11:57:09 CEST 2010 - vuntz@opensuse.org + +- Update to version 1.6.0: + + afc: Allow copy of folders + + gphoto2: Don't access things accessible via afc too + + Updated translations. + +------------------------------------------------------------------- +Mon Mar 8 17:28:55 CET 2010 - dimstar@opensuse.org + +- Update to version 1.5.5: + + Fix with-dbus-service-dir configure switch + + ftp: Cleanup (close the data connection unconditionally) + + archive: Use archive_errno() the correct way + + Correct return values on error for programs + + Translation updates. +- Rebase gvfs-dice-backend.patch. + ------------------------------------------------------------------- Wed Feb 24 12:15:22 CET 2010 - dimstar@opensuse.org diff --git a/gvfs.spec b/gvfs.spec index a00b409..7d6329c 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -1,5 +1,5 @@ # -# spec file for package gvfs (Version 1.5.4) +# spec file for package gvfs (Version 1.6.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: gvfs -Version: 1.5.4 +Version: 1.6.0 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+ diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000