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

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

gvfs-1.5.5.tar.bz2

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

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)			\

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
 

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+