From 9041e04274cfc88fc9c786dd593997c94d159a18 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 15:53:38 +0000 Subject: import spice-vdagent-0.14.0-10.el7 --- diff --git a/SOURCES/0014-vdagent-file-xfers-only-open-the-file-transfer-dir-w.patch b/SOURCES/0014-vdagent-file-xfers-only-open-the-file-transfer-dir-w.patch new file mode 100644 index 0000000..1aa907a --- /dev/null +++ b/SOURCES/0014-vdagent-file-xfers-only-open-the-file-transfer-dir-w.patch @@ -0,0 +1,30 @@ +From 6705c11d7ec4808e2dc70e7a4875323e2dfd0f62 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= +Date: Thu, 28 Aug 2014 16:24:04 +0200 +Subject: [PATCH] vdagent-file-xfers: only open the file transfer dir when all + the files were transferred + +Once transferring multiple files is supported, do not bother the user +opening the file transfer directory for each file transferred, just do it +when the last file transfer is finished. +--- + src/vdagent-file-xfers.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/vdagent-file-xfers.c b/src/vdagent-file-xfers.c +index b792282..4dea6de 100644 +--- a/src/vdagent-file-xfers.c ++++ b/src/vdagent-file-xfers.c +@@ -282,7 +282,8 @@ void vdagent_file_xfers_data(struct vdagent_file_xfers *xfers, + close(task->file_fd); + task->file_fd = -1; + if (xfers->open_save_dir && +- task->file_xfer_nr == task->file_xfer_total) { ++ task->file_xfer_nr == task->file_xfer_total && ++ g_hash_table_size(xfers->xfers) == 1) { + char buf[PATH_MAX]; + snprintf(buf, PATH_MAX, "xdg-open '%s'&", xfers->save_dir); + status = system(buf); +-- +2.1.0 + diff --git a/SPECS/spice-vdagent.spec b/SPECS/spice-vdagent.spec index 810485b..56e7d72 100644 --- a/SPECS/spice-vdagent.spec +++ b/SPECS/spice-vdagent.spec @@ -1,6 +1,6 @@ Name: spice-vdagent Version: 0.14.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Agent for Spice guests Group: Applications/System License: GPLv3+ @@ -23,6 +23,7 @@ Patch10: 0010-randr-Make-resolution-changing-more-robust.patch Patch11: 0011-Don-t-abort-if-XRRSetCrtcConfig-fails.patch Patch12: 0012-Fix-gdm-autostart-path.patch Patch13: 0013-data-remove-rsyslog-config-files.patch +Patch14: 0014-vdagent-file-xfers-only-open-the-file-transfer-dir-w.patch BuildRequires: systemd-devel glib2-devel spice-protocol >= 0.12.6 BuildRequires: libpciaccess-devel libXrandr-devel libXinerama-devel BuildRequires: libXfixes-devel systemd-units desktop-file-utils libtool @@ -57,6 +58,7 @@ Features: %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 autoreconf -fi @@ -98,6 +100,10 @@ rm $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/spice-vdagentd.conf %changelog +* Fri Jun 05 2015 Jonathon Jongsma - 0.14.0-10 +- Don't open a separate file manager for each file transfered + Resolves: rhbz#1168324 + * Tue Sep 23 2014 Christophe Fergeau 0.14.0-9 - Don't install rsyslog config file. This can cause duplicate logging to syslog in rhel6->rhel7 upgrades, and is not really useful anyway