From c97d6ecb80b763df323394804eddd1ab7bdc13b852b92c4448d40834eb3353d7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 28 Oct 2015 15:43:54 +0000 Subject: [PATCH] Accepting request 341127 from GNOME:Next Patches rebased OBS-URL: https://build.opensuse.org/request/show/341127 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=219 --- gvfs-nds.patch | 8 ++++---- gvfs-nvvfs.patch | 8 ++++---- gvfs.changes | 7 +++++++ gvfs.spec | 29 +++++++++++++---------------- 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/gvfs-nds.patch b/gvfs-nds.patch index 446c375..efd16f3 100644 --- a/gvfs-nds.patch +++ b/gvfs-nds.patch @@ -818,7 +818,7 @@ Index: gvfs-1.9.0/daemon/Makefile.am =================================================================== --- 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 +@@ -143,6 +143,10 @@ mount_in_files += nvvfs.mount.in mount_DATA += nvvfs.mount libexec_PROGRAMS += gvfsd-nvvfs @@ -827,9 +827,9 @@ Index: gvfs-1.9.0/daemon/Makefile.am +libexec_PROGRAMS += gvfsd-nds + EXTRA_DIST = \ - gvfs-daemon.service.in \ - $(mount_in_files) \ -@@ -449,6 +453,19 @@ gvfsd_http_CPPFLAGS = \ + $(service_in_files) \ + $(systemd_user_in_files) \ +@@ -525,6 +529,19 @@ gvfsd_http_CPPFLAGS = \ gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS) diff --git a/gvfs-nvvfs.patch b/gvfs-nvvfs.patch index 782b752..484fac0 100644 --- a/gvfs-nvvfs.patch +++ b/gvfs-nvvfs.patch @@ -653,7 +653,7 @@ Index: gvfs-1.15.1/daemon/Makefile.am =================================================================== --- gvfs-1.15.1.orig/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) @@ -662,9 +662,9 @@ Index: gvfs-1.15.1/daemon/Makefile.am +libexec_PROGRAMS += gvfsd-nvvfs + EXTRA_DIST = \ - gvfs-daemon.service.in \ - $(mount_in_files) \ -@@ -464,6 +468,20 @@ gvfsd_http_CPPFLAGS = \ + $(service_in_files) \ + $(systemd_user_in_files) \ +@@ -521,6 +525,20 @@ gvfsd_http_CPPFLAGS = \ gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS) diff --git a/gvfs.changes b/gvfs.changes index 5500993..9763819 100644 --- a/gvfs.changes +++ b/gvfs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/gvfs.spec b/gvfs.spec index 2633935..8827aaf 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -1,7 +1,7 @@ # # spec file for package gvfs # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,14 +28,14 @@ Group: Development/Libraries/C and C++ Url: http://www.gnome.org Source0: http://download.gnome.org/sources/gvfs/1.26/%{name}-%{version}.tar.xz 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-OPENSUSE gvfs-nvvfs.patch ksamrat@novell.com -- Provides gvfs backend for novell nautilus plugin Patch5: gvfs-nvvfs.patch -# PATCH-NEEDS-REBASE was: # PATCH-FEATURE-OPENSUSE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus +# PATCH-FEATURE-OPENSUSE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus Patch6: gvfs-nds.patch +# needed for patches 5 and 6 +BuildRequires: autoconf BuildRequires: docbook-xsl-stylesheets BuildRequires: fuse-devel -# Only needed for patch 5 & 6 - disabled for now -#BuildRequires: gnome-common BuildRequires: intltool BuildRequires: libarchive-devel BuildRequires: libavahi-glib-devel @@ -129,13 +129,12 @@ VFS functionality for GLib. %prep %setup -q translation-update-upstream -# Patch 5 & 6 disabled - needs rebase -#patch5 -p1 -#patch6 -p1 +%patch5 -p1 +%patch6 -p1 %build -# Only needed for patch 5 & 6 - disabled -#NOCONFIGURE=1 gnome-autogen.sh +# needed for patches 5 and 6 +autoreconf %configure \ --libexecdir=%{_libexecdir}/%{name} \ %if %{with_udisks2} @@ -269,14 +268,12 @@ rm -rf %{buildroot} %{_datadir}/%{name}/remote-volume-monitors/mtp.monitor %{_datadir}/dbus-1/services/org.gtk.vfs.MTPVolumeMonitor.service %{_datadir}/%{name}/mounts/mtp.mount -# disabled - patch rebase -#{_libexecdir}/%{name}/gvfsd-nds -#{_datadir}/%{name}/mounts/nds.mount +%{_libexecdir}/%{name}/gvfsd-nds +%{_datadir}/%{name}/mounts/nds.mount %{_libexecdir}/%{name}/gvfsd-network %{_datadir}/%{name}/mounts/network.mount -# disabled - patch rebase -#{_libexecdir}/%{name}/gvfsd-nvvfs -#{_datadir}/%{name}/mounts/nvvfs.mount +%{_libexecdir}/%{name}/gvfsd-nvvfs +%{_datadir}/%{name}/mounts/nvvfs.mount %{_libexecdir}/%{name}/gvfsd-recent %{_datadir}/%{name}/mounts/recent.mount %{_libexecdir}/%{name}/gvfsd-sftp