pool/gvfs
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 341501 from GNOME:Factory

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/341501
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gvfs?expand=0&rev=116
This commit is contained in:
Stephan Kulow 2015-10-30 20:52:50 +00:00 committed by Git OBS Bridge
commit 7647e52ad2
4 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gvfs-nds.patch
View File

@ -818,7 +818,7 @@ Index: gvfs-1.9.0/daemon/Makefile.am
=================================================================== ===================================================================
--- gvfs-1.9.0.orig/daemon/Makefile.am --- gvfs-1.9.0.orig/daemon/Makefile.am
+++ gvfs-1.9.0/daemon/Makefile.am +++ gvfs-1.9.0/daemon/Makefile.am
@@ -113,6 +113,10 @@ mount_in_files += nvvfs.mount.in @@ -143,6 +143,10 @@ mount_in_files += nvvfs.mount.in
mount_DATA += nvvfs.mount mount_DATA += nvvfs.mount
libexec_PROGRAMS += gvfsd-nvvfs libexec_PROGRAMS += gvfsd-nvvfs
@ -827,9 +827,9 @@ Index: gvfs-1.9.0/daemon/Makefile.am
+libexec_PROGRAMS += gvfsd-nds +libexec_PROGRAMS += gvfsd-nds
+ +
EXTRA_DIST = \ EXTRA_DIST = \
gvfs-daemon.service.in \ $(service_in_files) \
$(mount_in_files) \ $(systemd_user_in_files) \
@@ -449,6 +453,19 @@ gvfsd_http_CPPFLAGS = \ @@ -525,6 +529,19 @@ gvfsd_http_CPPFLAGS = \
gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS) gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS)

8
gvfs-nvvfs.patch
View File

@ -653,7 +653,7 @@ Index: gvfs-1.15.1/daemon/Makefile.am
=================================================================== ===================================================================
--- gvfs-1.15.1.orig/daemon/Makefile.am --- gvfs-1.15.1.orig/daemon/Makefile.am
+++ gvfs-1.15.1/daemon/Makefile.am +++ gvfs-1.15.1/daemon/Makefile.am
@@ -124,6 +124,10 @@ endif @@ -139,6 +139,10 @@ endif
noinst_DATA = $(mount_DATA:.mount=.localmount) noinst_DATA = $(mount_DATA:.mount=.localmount)
@ -662,9 +662,9 @@ Index: gvfs-1.15.1/daemon/Makefile.am
+libexec_PROGRAMS += gvfsd-nvvfs +libexec_PROGRAMS += gvfsd-nvvfs
+ +
EXTRA_DIST = \ EXTRA_DIST = \
gvfs-daemon.service.in \ $(service_in_files) \
$(mount_in_files) \ $(systemd_user_in_files) \
@@ -464,6 +468,20 @@ gvfsd_http_CPPFLAGS = \ @@ -521,6 +525,20 @@ gvfsd_http_CPPFLAGS = \
gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS) gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS)

14
gvfs.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue Oct 27 10:49:52 UTC 2015 - zaitor@opensuse.org
- Change patch-tags from PATCH-FEATURE-OPENSUSE to
PATCH-FEATURE-SLE, lets use the tag where they actually are
wanted.
-------------------------------------------------------------------
Fri Oct 23 19:19:16 UTC 2015 - mgorse@suse.com
- Rebase gvfs-nds.patch and gvfs-nvvfs.patch. Also run
autoreconf, since patches modify daemon/Makefile.am.
- Replace gnome-common for autoconf BuildRequires.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 15 09:28:18 UTC 2015 - zaitor@opensuse.org Thu Oct 15 09:28:18 UTC 2015 - zaitor@opensuse.org

27
gvfs.spec
View File

@ -28,14 +28,14 @@ Group: Development/Libraries/C and C++
Url: http://www.gnome.org Url: http://www.gnome.org
Source0: http://download.gnome.org/sources/gvfs/1.26/%{name}-%{version}.tar.xz Source0: http://download.gnome.org/sources/gvfs/1.26/%{name}-%{version}.tar.xz
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-NEEDS-REBASE was: # PATCH-FEATURE-OPENSUSE gvfs-nvvfs.patch ksamrat@novell.com -- Provides gvfs backend for novell nautilus plugin # PATCH-FEATURE-SLE gvfs-nvvfs.patch ksamrat@novell.com -- Provides gvfs backend for novell nautilus plugin
Patch5: gvfs-nvvfs.patch Patch5: gvfs-nvvfs.patch
# PATCH-NEEDS-REBASE was: # PATCH-FEATURE-OPENSUSE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus # PATCH-FEATURE-SLE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus
Patch6: gvfs-nds.patch Patch6: gvfs-nds.patch
# needed for patches 5 and 6
BuildRequires: autoconf
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: fuse-devel BuildRequires: fuse-devel
# Only needed for patch 5 & 6 - disabled for now
#BuildRequires: gnome-common
BuildRequires: intltool BuildRequires: intltool
BuildRequires: libarchive-devel BuildRequires: libarchive-devel
BuildRequires: libavahi-glib-devel BuildRequires: libavahi-glib-devel
@ -129,13 +129,12 @@ VFS functionality for GLib.
%prep %prep
%setup -q %setup -q
translation-update-upstream translation-update-upstream
# Patch 5 & 6 disabled - needs rebase %patch5 -p1
#patch5 -p1 %patch6 -p1
#patch6 -p1
%build %build
# Only needed for patch 5 & 6 - disabled # needed for patches 5 and 6
#NOCONFIGURE=1 gnome-autogen.sh autoreconf
%configure \ %configure \
--libexecdir=%{_libexecdir}/%{name} \ --libexecdir=%{_libexecdir}/%{name} \
%if %{with_udisks2} %if %{with_udisks2}
@ -269,14 +268,12 @@ rm -rf %{buildroot}
%{_datadir}/%{name}/remote-volume-monitors/mtp.monitor %{_datadir}/%{name}/remote-volume-monitors/mtp.monitor
%{_datadir}/dbus-1/services/org.gtk.vfs.MTPVolumeMonitor.service %{_datadir}/dbus-1/services/org.gtk.vfs.MTPVolumeMonitor.service
%{_datadir}/%{name}/mounts/mtp.mount %{_datadir}/%{name}/mounts/mtp.mount
# disabled - patch rebase %{_libexecdir}/%{name}/gvfsd-nds
#{_libexecdir}/%{name}/gvfsd-nds %{_datadir}/%{name}/mounts/nds.mount
#{_datadir}/%{name}/mounts/nds.mount
%{_libexecdir}/%{name}/gvfsd-network %{_libexecdir}/%{name}/gvfsd-network
%{_datadir}/%{name}/mounts/network.mount %{_datadir}/%{name}/mounts/network.mount
# disabled - patch rebase %{_libexecdir}/%{name}/gvfsd-nvvfs
#{_libexecdir}/%{name}/gvfsd-nvvfs %{_datadir}/%{name}/mounts/nvvfs.mount
#{_datadir}/%{name}/mounts/nvvfs.mount
%{_libexecdir}/%{name}/gvfsd-recent %{_libexecdir}/%{name}/gvfsd-recent
%{_datadir}/%{name}/mounts/recent.mount %{_datadir}/%{name}/mounts/recent.mount
%{_libexecdir}/%{name}/gvfsd-sftp %{_libexecdir}/%{name}/gvfsd-sftp