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

Accepting request 72759 from GNOME:Factory

Browse Source 
use 0%{suse_version} instead of only %{suse_version} to make autobuild team happy - See reject message on SR#72615 (forwarded request 72754 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/72759
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gvfs?expand=0&rev=67
This commit is contained in:
Sascha Peilicke 2011-06-07 12:11:47 +00:00 committed by Git OBS Bridge
commit a7bb2ce639
9 changed files with 176 additions and 2329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gvfs-1.6.6.tar.bz2
View File

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

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

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

2231
gvfs-dav-recursive-directory-ops.patch
View File

File diff suppressed because it is too large Load Diff

16
gvfs-dice-backend.patch
View File

@ -2092,19 +2092,19 @@ Index: gvfs-1.5.5/daemon/Makefile.am
- $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
+ $(GLIB_LIBS) $(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(KEYRING_LIBS)
# D-BUS service file
%.service: %.service.in ../config.log
gvfs_gschemas =
gvfs_gschemas_convert =
@@ -37,10 +38,10 @@ service_DATA = gvfs-daemon.service
%.mount: %.mount.in ../config.log
$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp
+libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-dice
-libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-network
+libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-network gvfsd-dice
-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_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 computer.mount burn.mount localtest.mount dice.mount
-mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in network.mount.in
-mount_DATA = sftp.mount trash.mount computer.mount burn.mount localtest.mount network.mount
+mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in network.mount.in dice.mount.in
+mount_DATA = sftp.mount trash.mount computer.mount burn.mount localtest.mount network.mount dice.mount
mount_in_files += http.mount.in dav.mount.in dav+sd.mount.in ftp.mount.in
if HAVE_HTTP

50
gvfs-glib-2.27.patch
View File

@ -1,50 +0,0 @@
commit 6115bf7549fc2a9171d7cd5eaec6bc1a58dfb8b2
Author: Vincent Untz <vuntz@gnome.org>
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 \

28
gvfs-nds.patch
View File

@ -1,7 +1,7 @@
Index: gvfs-1.5.4/daemon/gvfsbackendnds.c
Index: gvfs-1.9.0/daemon/gvfsbackendnds.c
===================================================================
--- /dev/null
+++ gvfs-1.5.4/daemon/gvfsbackendnds.c
+++ gvfs-1.9.0/daemon/gvfsbackendnds.c
@@ -0,0 +1,753 @@
+/* GIO - GLib Input, Output and Streaming Library
+ *
@ -756,10 +756,10 @@ Index: gvfs-1.5.4/daemon/gvfsbackendnds.c
+{
+ g_set_application_name (_("Displaying Embedded Objects"));
+}
Index: gvfs-1.5.4/daemon/gvfsbackendnds.h
Index: gvfs-1.9.0/daemon/gvfsbackendnds.h
===================================================================
--- /dev/null
+++ gvfs-1.5.4/daemon/gvfsbackendnds.h
+++ gvfs-1.9.0/daemon/gvfsbackendnds.h
@@ -0,0 +1,53 @@
+/* GIO - GLib Input, Output and Streaming Library
+ *
@ -814,11 +814,11 @@ Index: gvfs-1.5.4/daemon/gvfsbackendnds.h
+G_END_DECLS
+
+#endif /* __G_VFS_BACKEND_NDS_H__ */
Index: gvfs-1.5.4/daemon/Makefile.am
Index: gvfs-1.9.0/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
--- gvfs-1.9.0.orig/daemon/Makefile.am
+++ gvfs-1.9.0/daemon/Makefile.am
@@ -113,6 +113,10 @@ mount_in_files += nvvfs.mount.in
mount_DATA += nvvfs.mount
libexec_PROGRAMS += gvfsd-nvvfs
@ -826,10 +826,10 @@ Index: gvfs-1.5.4/daemon/Makefile.am
+mount_DATA += nds.mount
+libexec_PROGRAMS += gvfsd-nds
+
EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list
DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
@@ -442,6 +446,19 @@ gvfsd_http_CPPFLAGS = \
EXTRA_DIST = \
gvfs-daemon.service.in \
$(mount_in_files) \
@@ -449,6 +453,19 @@ gvfsd_http_CPPFLAGS = \
gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS)
@ -849,10 +849,10 @@ Index: gvfs-1.5.4/daemon/Makefile.am
gvfsd_nvvfs_SOURCES = \
gvfsbackendnvvfs.c gvfsbackendnvvfs.h \
daemon-main.c daemon-main.h \
Index: gvfs-1.5.4/daemon/nds.mount.in
Index: gvfs-1.9.0/daemon/nds.mount.in
===================================================================
--- /dev/null
+++ gvfs-1.5.4/daemon/nds.mount.in
+++ gvfs-1.9.0/daemon/nds.mount.in
@@ -0,0 +1,5 @@
+[Mount]
+Type=nds

6
gvfs-nvvfs.patch
View File

@ -661,9 +661,9 @@ Index: gvfs-1.5.1/daemon/Makefile.am
+mount_DATA += nvvfs.mount
+libexec_PROGRAMS += gvfsd-nvvfs
+
EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list
DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
EXTRA_DIST = \
gvfs-daemon.service.in \
$(mount_in_files) \
@@ -438,6 +442,20 @@ gvfsd_http_CPPFLAGS = \
gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS)

116
gvfs.changes
View File

@ -1,9 +1,125 @@
-------------------------------------------------------------------
Mon Jun 6 10:05:48 UTC 2011 - dimstar@opensuse.org
- Use 0%%{suse_version} instead of %%{suse_version} only to make
sure we have a value, even when suse_version is not defined.
-------------------------------------------------------------------
Wed May 18 03:40:29 CEST 2011 - dimstar@opensuse.org
- Update to version 1.9.0:
+ afc:
- Fix renaming files moving them to the root dir
- Use a better display name for jailbroken device access
+ common: Use libbluray to get Blu-Ray metadata
+ daemon:
- Fix threadsafety of closing channels
- Don't leak dbus messages
+ fuse:
- Make created files visible immediately on WebDAV
- Pretend created file exists even if backend didn't create it
+ gdu volume monitor:
- Fix setting the BDMV name
- Fix check for symlinks in /dev
- Automount flash card readers
+ gphoto2:
- Recognize cameras which don't implement get storageinfo
+ dav:
- Fix copying of remote folders to disk
- Correctly handle usernames supplied in the url
+ http/dav: Send Accept-Language header
+ http: Use Content-Disposition filename if available
+ Updated translations.
- Drop gvfs-dav-recursive-directory-ops.patch: fixed upstream.
-------------------------------------------------------------------
Tue Apr 26 15:16:06 UTC 2011 - fcrozat@novell.com
- Update to version 1.8.1:
+ Fix threadsafety of closing channels.
+ Don't leak dbus messages.
+ gdu:
- Fix setting the BDMV name.
- Fix check for symlinks in /dev, was reversed.
+ Updated translations.
- Version libimobiledevice-devel BuildRequires with >= 1.1.0, to
make sure we don't even try to build if we don't have the right
version. New libimobiledevice will reach Factory soon.
-------------------------------------------------------------------
Tue Apr 5 11:55:02 UTC 2011 - fcrozat@novell.com
- Update to version 1.8.0:
+ afc: Fix renaming files moving them to the root dir
+ Updated translations.
-------------------------------------------------------------------
Mon Mar 21 16:49:05 UTC 2011 - fcrozat@novell.com
- Update to version 1.7.3!
+ client: Fix wrong assignment before dbus_connection_unref()
+ archive:
- Prevent assertion failure on duplicate mount
- Skip leading "./" from pathnames if present
- Propagate entry index as inode no. for files
+ smb: Add support for default location
+ Build fixes.
+ Updated translations.
- Rebase gvfs-dav-recursive-directory-ops.patch.
-------------------------------------------------------------------
Thu Mar 10 11:09:26 CET 2011 - vuntz@opensuse.org
- Move gvfsd-metadata daemon to the main gvfs package, and ship
dbus .service files with their appropriate daemons, to avoid
declaring a dbus service if the binary is not installed.
-------------------------------------------------------------------
Mon Feb 28 11:11:32 UTC 2011 - fcrozat@novell.com
- Update to version 1.7.2:
+ ftp: Parse mode, user and group for unix listings
+ ftp: Implement chmod
+ sftp: Catch invalid argument type for chmod command
+ smb: Catch invalid argument type when setting mtime
+ Updated translations.
- Changes from version 1.7.1:
+ ftp: Fix refcounting of addresses when connecting
+ ftp: Detect TLS and SSL support
+ afc: Add ability to mount the house-arrest service
+ afc: Add support for House Arrest protocol to access
the Documents/ folder within applications
+ Fix gvfs client code on ARM platform
+ Various build issues fixed
+ Updated translations.
-------------------------------------------------------------------
Thu Jan 13 18:31:47 CET 2011 - hpj@novell.com
- Add gvfs-dav-recursive-directory-ops.patch (bnc#395225). This
makes copying directories over WebDAV work.
-------------------------------------------------------------------
Thu Dec 16 17:40:53 CET 2010 - vuntz@opensuse.org
- Update to version 1.7.0:
+ sftp: Close pty master in child process to prevent SELinux
denial
+ fuse: Add proper truncate support for open()
+ Port to GSettings
+ gdu: Treat mounts as hidden if they have a path element
that starts with a dot
+ Updated translations.
- Drop gvfs-glib-2.27.patch: this is not needed anymore.
- Rebase gvfs-dice-backend.patch, gvfs-nds.patch and
gvfs-nvvfs.patch.
- Remove gconf2-devel BuildRequires.
- Remove check for openSUSE 11.1 and earlier: we won't support 11.1
anymore.
- Handle gsettings schemas: add %glib2_gsettings_schema_requires
for gvfs-backends, and %glib2_gsettings_schema_post(un) in the
gvfs-backends scriptlets.
-------------------------------------------------------------------
Mon Dec 6 16:10:56 CET 2010 - vuntz@opensuse.org

52
gvfs.spec
View File

@ -18,8 +18,9 @@
Name: gvfs
Version: 1.6.6
Release: 3
Version: 1.9.0
Release: 1
# FIXME: add libbluray BuildRequires once available (fate#312440)
License: LGPLv2.0+
Summary: VFS functionality for GLib
Url: http://www.gnome.org
@ -32,33 +33,26 @@ Patch1: gvfs-dice-backend.patch
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
# PATCH-FIX-UPSTREAM gvfs-dav-recursive-directory-ops.patch bnc#395225 bgo#551339 hpj@novell.com -- Make DAV recursive copy/move work, taken from http://gitorious.org/lanedo/gvfs/commits/dav_sync_io
Patch8: gvfs-dav-recursive-directory-ops.patch
BuildRequires: bluez-devel
BuildRequires: dbus-1-glib-devel
BuildRequires: fuse-devel
BuildRequires: gconf2-devel
BuildRequires: glib2-devel
BuildRequires: intltool
BuildRequires: libarchive-devel
BuildRequires: libavahi-glib-devel
BuildRequires: libcdio-devel
BuildRequires: libexpat-devel
BuildRequires: libgdu-devel
BuildRequires: libgnome-keyring-devel
BuildRequires: libgphoto2-devel
BuildRequires: libimobiledevice-devel
BuildRequires: libgudev-1_0-devel
BuildRequires: libimobiledevice-devel >= 1.1.0
BuildRequires: libsmbclient-devel
BuildRequires: libsoup-devel
BuildRequires: pkg-config
BuildRequires: translation-update-upstream
%if %suse_version > 1110
BuildRequires: libgdu-devel
BuildRequires: libgudev-1_0-devel
%endif
Recommends: %{name}-lang
Requires: libgvfscommon0 = %{version}
Recommends: %{name}-lang
Recommends: gvfs-backends
Recommends: gvfs-common
Recommends: gvfs-fuse
@ -93,6 +87,7 @@ Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Recommends: gvfs-backend-afc
Recommends: obex-data-server
%glib2_gsettings_schema_requires
%description backends
VFS functionality for GLib.
@ -123,12 +118,10 @@ translation-update-upstream
%patch1 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%build
autoreconf -f
libtoolize -c -f
%build
%configure \
--libexecdir=%{_libexecdir}/%{name} \
--disable-static
@ -151,6 +144,12 @@ chmod -x %{buildroot}%{_sysconfdir}/profile.d/*
%postun
%glib2_gio_module_postun
%post backends
%glib2_gsettings_schema_post
%postun backends
%glib2_gsettings_schema_postun
%post -n libgvfscommon0 -p /sbin/ldconfig
%postun -n libgvfscommon0 -p /sbin/ldconfig
@ -162,13 +161,15 @@ rm -rf %{buildroot}
%defattr(-, root, root)
%doc AUTHORS NEWS README TODO
%{_bindir}/*
%{_datadir}/dbus-1/services/*.service
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/mounts
%dir %{_datadir}/%{name}/remote-volume-monitors
%{_libdir}/gio/modules/*.so
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/gvfsd
%{_datadir}/dbus-1/services/gvfs-daemon.service
%{_libexecdir}/%{name}/gvfsd-metadata
%{_datadir}/dbus-1/services/gvfs-metadata.service
%{_sysconfdir}/profile.d/*
%files fuse
@ -178,17 +179,20 @@ rm -rf %{buildroot}
%files backend-afc
%defattr(-, root, root)
%{_libexecdir}/%{name}/gvfs-afc-volume-monitor
%{_datadir}/dbus-1/services/org.gtk.Private.AfcVolumeMonitor.service
%{_datadir}/%{name}/remote-volume-monitors/afc.monitor
%{_libexecdir}/%{name}/gvfsd-afc
%{_datadir}/%{name}/mounts/afc.mount
%files backends
%defattr(-, root, root)
%if %suse_version > 1110
%if 0%{suse_version} > 1110
%{_libexecdir}/%{name}/gvfs-gdu-volume-monitor
%{_datadir}/dbus-1/services/org.gtk.Private.GduVolumeMonitor.service
%{_datadir}/%{name}/remote-volume-monitors/gdu.monitor
%endif
%{_libexecdir}/%{name}/gvfs-gphoto2-volume-monitor
%{_datadir}/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
%{_datadir}/%{name}/remote-volume-monitors/gphoto2.monitor
%{_libexecdir}/%{name}/gvfsd-archive
%{_datadir}/%{name}/mounts/archive.mount
@ -213,7 +217,6 @@ rm -rf %{buildroot}
%{_datadir}/%{name}/mounts/http.mount
%{_libexecdir}/%{name}/gvfsd-localtest
%{_datadir}/%{name}/mounts/localtest.mount
%{_libexecdir}/%{name}/gvfsd-metadata
%{_libexecdir}/%{name}/gvfsd-nds
%{_datadir}/%{name}/mounts/nds.mount
%{_libexecdir}/%{name}/gvfsd-network
@ -231,6 +234,15 @@ rm -rf %{buildroot}
# gvfsd-trash is GPLv3 because of trashlib.
%{_libexecdir}/%{name}/gvfsd-trash
%{_datadir}/%{name}/mounts/trash.mount
# GSettings schemas & conversion data
# Those schemas are used by gvfsd-network & gvfsd-smb
%{_datadir}/glib-2.0/schemas/org.gnome.system.dns_sd.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.system.gvfs.enums.xml
%{_datadir}/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
%dir %{_datadir}/GConf
%dir %{_datadir}/GConf/gsettings
%{_datadir}/GConf/gsettings/gvfs-dns-sd.convert
%{_datadir}/GConf/gsettings/gvfs-smb.convert
%files -n libgvfscommon0
%defattr(-, root, root)