rpm/gvfs
SHA256
1
0
Fork 0
forked from pool/gvfs
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
OBS User unknown 2009-08-06 20:00:21 +00:00 committed by Git OBS Bridge
parent 3002ed342b
commit 2352f518e6
5 changed files with 53 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gvfs-1.3.2.tar.bz2
View File

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

3
gvfs-1.3.3.tar.bz2 Normal file
View File

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

57
gvfs-dice-backend.patch
View File

@ -1,7 +1,8 @@
diff -Naur ./gvfs-1.0.2.orig/configure.ac gvfs-1.0.2/configure.ac Index: gvfs-1.3.3/configure.ac
--- ./gvfs-1.0.2.orig/configure.ac 2008-09-24 12:02:11.000000000 -0600 ===================================================================
+++ gvfs-1.0.2/configure.ac 2008-11-07 14:52:13.000000000 -0700 --- gvfs-1.3.3.orig/configure.ac
@@ -53,6 +53,10 @@ +++ gvfs-1.3.3/configure.ac
@@ -53,6 +53,10 @@ PKG_CHECK_MODULES(DBUS, dbus-1)
AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS) AC_SUBST(DBUS_LIBS)
@ -12,9 +13,10 @@ diff -Naur ./gvfs-1.0.2.orig/configure.ac gvfs-1.0.2/configure.ac
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) 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 DBUS_SERVICE_DIR=$with_dbus_service_dir
AC_SUBST(DBUS_SERVICE_DIR) AC_SUBST(DBUS_SERVICE_DIR)
diff -Naur ./gvfs-1.0.2.orig/daemon/dice.mount.in gvfs-1.0.2/daemon/dice.mount.in Index: gvfs-1.3.3/daemon/dice.mount.in
--- ./gvfs-1.0.2.orig/daemon/dice.mount.in 1969-12-31 17:00:00.000000000 -0700 ===================================================================
+++ gvfs-1.0.2/daemon/dice.mount.in 2008-11-07 15:02:26.000000000 -0700 --- /dev/null
+++ gvfs-1.3.3/daemon/dice.mount.in
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+[Mount] +[Mount]
+Type=dice +Type=dice
@ -22,9 +24,10 @@ diff -Naur ./gvfs-1.0.2.orig/daemon/dice.mount.in gvfs-1.0.2/daemon/dice.mount.i
+AutoMount=true +AutoMount=true
+DBusName=org.gtk.vfs.mountpoint.dice +DBusName=org.gtk.vfs.mountpoint.dice
+ +
diff -Naur ./gvfs-1.0.2.orig/daemon/gvfsbackenddice.c gvfs-1.0.2/daemon/gvfsbackenddice.c Index: gvfs-1.3.3/daemon/gvfsbackenddice.c
--- ./gvfs-1.0.2.orig/daemon/gvfsbackenddice.c 1969-12-31 17:00:00.000000000 -0700 ===================================================================
+++ gvfs-1.0.2/daemon/gvfsbackenddice.c 2008-11-07 14:53:39.000000000 -0700 --- /dev/null
+++ gvfs-1.3.3/daemon/gvfsbackenddice.c
@@ -0,0 +1,1989 @@ @@ -0,0 +1,1989 @@
+/* Novell DICE Backend for GVfs +/* Novell DICE Backend for GVfs
+ * + *
@ -2015,9 +2018,10 @@ diff -Naur ./gvfs-1.0.2.orig/daemon/gvfsbackenddice.c gvfs-1.0.2/daemon/gvfsback
+// backend_class->create_dir_monitor = do_create_dir_monitor; +// backend_class->create_dir_monitor = do_create_dir_monitor;
+// backend_class->create_file_monitor = do_create_file_monitor; +// backend_class->create_file_monitor = do_create_file_monitor;
+} +}
diff -Naur ./gvfs-1.0.2.orig/daemon/gvfsbackenddice.h gvfs-1.0.2/daemon/gvfsbackenddice.h Index: gvfs-1.3.3/daemon/gvfsbackenddice.h
--- ./gvfs-1.0.2.orig/daemon/gvfsbackenddice.h 1969-12-31 17:00:00.000000000 -0700 ===================================================================
+++ gvfs-1.0.2/daemon/gvfsbackenddice.h 2008-11-07 14:53:39.000000000 -0700 --- /dev/null
+++ gvfs-1.3.3/daemon/gvfsbackenddice.h
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
+/* Novell IceDesktop Backend for GVfs +/* Novell IceDesktop Backend for GVfs
+ * + *
@ -2069,10 +2073,11 @@ diff -Naur ./gvfs-1.0.2.orig/daemon/gvfsbackenddice.h gvfs-1.0.2/daemon/gvfsback
+G_END_DECLS +G_END_DECLS
+ +
+#endif /* __G_VFS_BACKEND_DICE_H__ */ +#endif /* __G_VFS_BACKEND_DICE_H__ */
diff -Naur ./gvfs-1.0.2.orig/daemon/Makefile.am gvfs-1.0.2/daemon/Makefile.am Index: gvfs-1.3.3/daemon/Makefile.am
--- ./gvfs-1.0.2.orig/daemon/Makefile.am 2008-09-14 06:05:05.000000000 -0600 ===================================================================
+++ gvfs-1.0.2/daemon/Makefile.am 2008-11-07 15:00:04.000000000 -0700 --- gvfs-1.3.3.orig/daemon/Makefile.am
@@ -8,6 +8,7 @@ +++ gvfs-1.3.3/daemon/Makefile.am
@@ -10,6 +10,7 @@ INCLUDES = \
-I$(top_srcdir)/common \ -I$(top_srcdir)/common \
-I$(top_builddir) \ -I$(top_builddir) \
$(GLIB_CFLAGS) $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
@ -2080,7 +2085,7 @@ diff -Naur ./gvfs-1.0.2.orig/daemon/Makefile.am gvfs-1.0.2/daemon/Makefile.am
$(OBEXFTP_CFLAGS) $(XML_CFLAGS) \ $(OBEXFTP_CFLAGS) $(XML_CFLAGS) \
$(KEYRING_CFLAGS) \ $(KEYRING_CFLAGS) \
-DDBUS_API_SUBJECT_TO_CHANGE \ -DDBUS_API_SUBJECT_TO_CHANGE \
@@ -21,7 +22,7 @@ @@ -24,7 +25,7 @@ noinst_LTLIBRARIES=libdaemon.la
libraries = \ libraries = \
libdaemon.la \ libdaemon.la \
$(top_builddir)/common/libgvfscommon.la \ $(top_builddir)/common/libgvfscommon.la \
@ -2089,23 +2094,23 @@ diff -Naur ./gvfs-1.0.2.orig/daemon/Makefile.am gvfs-1.0.2/daemon/Makefile.am
# D-BUS service file # D-BUS service file
%.service: %.service.in ../config.log %.service: %.service.in ../config.log
@@ -34,10 +35,10 @@ @@ -37,10 +38,10 @@ service_DATA = gvfs-daemon.service
%.mount: %.mount.in ../config.log %.mount: %.mount.in ../config.log
sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest -libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp
+libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-dice gvfsd-computer gvfsd-burn gvfsd-localtest +libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-dice
-mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in -mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in
-mount_DATA = sftp.mount trash.mount computer.mount burn.mount localtest.mount -mount_DATA = sftp.mount trash.mount computer.mount burn.mount localtest.mount
+mount_in_files = sftp.mount.in trash.mount.in dice.mount.in computer.mount.in burn.mount.in localtest.mount.in +mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in dice.mount.in
+mount_DATA = sftp.mount trash.mount dice.mount computer.mount burn.mount localtest.mount +mount_DATA = sftp.mount trash.mount computer.mount burn.mount localtest.mount dice.mount
mount_in_files += http.mount.in dav.mount.in ftp.mount.in mount_in_files += http.mount.in dav.mount.in dav+sd.mount.in ftp.mount.in
if HAVE_HTTP if HAVE_HTTP
@@ -264,6 +265,19 @@ @@ -286,6 +287,19 @@ gvfsd_trash_CPPFLAGS = \
gvfsd_trash_LDADD = $(libraries) gvfsd_trash_LDADD = trashlib/libtrash.a $(libraries)
+gvfsd_dice_SOURCES = \ +gvfsd_dice_SOURCES = \
+ gvfsbackenddice.c gvfsbackenddice.h \ + gvfsbackenddice.c gvfsbackenddice.h \

15
gvfs.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Jul 29 23:21:33 CEST 2009 - vuntz@novell.com
- Update to version 1.3.3:
+ Call dbus_threads_init_default before doing any other dbus
calls.
+ Always build gvfsd-ftp.
+ When a p2p connection is closed, cancel all pending jobs.
+ Improve debut output.
+ Code cleanup.
+ Updated translations.
- Uncomment the libgdu-devel BuildRequires now that we have a
recent enough version.
- Respin gvfs-dice-backend.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 20 14:49:24 CEST 2009 - dominique-obs@leuenberger.net Mon Jul 20 14:49:24 CEST 2009 - dominique-obs@leuenberger.net

8
gvfs.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gvfs (Version 1.3.2) # spec file for package gvfs (Version 1.3.3)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -31,8 +31,7 @@ BuildRequires: libarchive-devel
BuildRequires: libavahi-glib-devel BuildRequires: libavahi-glib-devel
BuildRequires: libcdio-devel BuildRequires: libcdio-devel
BuildRequires: libexpat-devel BuildRequires: libexpat-devel
# Current gnome-disk-utility is not recent enough BuildRequires: libgdu-devel
#BuildRequires: libgdu-devel
BuildRequires: libgphoto2-devel BuildRequires: libgphoto2-devel
BuildRequires: libgudev-1_0-devel BuildRequires: libgudev-1_0-devel
BuildRequires: libsmbclient-devel BuildRequires: libsmbclient-devel
@ -40,7 +39,7 @@ BuildRequires: libsoup-devel
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: translation-update-upstream BuildRequires: translation-update-upstream
Summary: VFS functionality for GLib Summary: VFS functionality for GLib
Version: 1.3.2 Version: 1.3.3
Release: 1 Release: 1
License: LGPL v2.0 or later License: LGPL v2.0 or later
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
@ -183,6 +182,7 @@ rm -rf $RPM_BUILD_ROOT
%files backends %files backends
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/%{name}/gvfs-fuse-daemon %{_libdir}/%{name}/gvfs-fuse-daemon
%{_libdir}/%{name}/gvfs-gdu-volume-monitor
%{_libdir}/%{name}/gvfs-gphoto2-volume-monitor %{_libdir}/%{name}/gvfs-gphoto2-volume-monitor
%{_libdir}/%{name}/gvfs-hal-volume-monitor %{_libdir}/%{name}/gvfs-hal-volume-monitor
%{_libdir}/%{name}/gvfsd-archive %{_libdir}/%{name}/gvfsd-archive