Hello community, here is the log from the commit of package gvfs for openSUSE:Factory checked in at 2015-10-30 21:52:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gvfs (Old) and /work/SRC/openSUSE:Factory/.gvfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gvfs" Changes: -------- --- /work/SRC/openSUSE:Factory/gvfs/gvfs.changes 2015-10-28 17:28:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gvfs.new/gvfs.changes 2015-10-30 21:52:51.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Oct 27 10:49:52 UTC 2015 - [email protected] + +- 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 - [email protected] + +- Rebase gvfs-nds.patch and gvfs-nvvfs.patch. Also run + autoreconf, since patches modify daemon/Makefile.am. +- Replace gnome-common for autoconf BuildRequires. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gvfs.spec ++++++ --- /var/tmp/diff_new_pack.zQY2kg/_old 2015-10-30 21:52:52.000000000 +0100 +++ /var/tmp/diff_new_pack.zQY2kg/_new 2015-10-30 21:52:52.000000000 +0100 @@ -28,14 +28,14 @@ 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 [email protected] -- Provides gvfs backend for novell nautilus plugin +# PATCH-FEATURE-SLE gvfs-nvvfs.patch [email protected] -- Provides gvfs backend for novell nautilus plugin Patch5: gvfs-nvvfs.patch -# PATCH-NEEDS-REBASE was: # PATCH-FEATURE-OPENSUSE gvfs-nds.patch [email protected] -- Provides NDS browsing for nautilus +# PATCH-FEATURE-SLE gvfs-nds.patch [email protected] -- 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 @@ %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 @@ %{_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 ++++++ gvfs-nds.patch ++++++ --- /var/tmp/diff_new_pack.zQY2kg/_old 2015-10-30 21:52:52.000000000 +0100 +++ /var/tmp/diff_new_pack.zQY2kg/_new 2015-10-30 21:52:52.000000000 +0100 @@ -818,7 +818,7 @@ =================================================================== --- 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 @@ +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) ++++++ gvfs-nvvfs.patch ++++++ --- /var/tmp/diff_new_pack.zQY2kg/_old 2015-10-30 21:52:52.000000000 +0100 +++ /var/tmp/diff_new_pack.zQY2kg/_new 2015-10-30 21:52:52.000000000 +0100 @@ -653,7 +653,7 @@ =================================================================== --- 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 @@ +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)
