From fd28b54c2a63b2678aa8bf62ad9244f95d42f1671919e736d97dbe29eb5a72d6 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 22 Jul 2015 12:30:55 +0000 Subject: [PATCH] Accepting request 317823 from home:pluskalm:branches:Virtualization - Update tp 0.16.0 * Xspice support * Release clipboard on client disconnect if owned by client (rhbz#1003977) * Turn some error messages into debugging messages (rhbz#918310) * Not having the virtio channel is not an error; instead silently do nothing - Cleanup spec file with spec-cleaner - Actually apply spice-vdagent-var_run.patch OBS-URL: https://build.opensuse.org/request/show/317823 OBS-URL: https://build.opensuse.org/package/show/Virtualization/spice-vdagent?expand=0&rev=10 --- spice-vdagent-0.15.0.tar.bz2 | 3 --- spice-vdagent-0.16.0.tar.bz2 | 3 +++ spice-vdagent-var_run.patch | 28 ++++++++++++++-------------- spice-vdagent.changes | 13 +++++++++++++ spice-vdagent.spec | 12 ++++++++---- 5 files changed, 38 insertions(+), 21 deletions(-) delete mode 100644 spice-vdagent-0.15.0.tar.bz2 create mode 100644 spice-vdagent-0.16.0.tar.bz2 diff --git a/spice-vdagent-0.15.0.tar.bz2 b/spice-vdagent-0.15.0.tar.bz2 deleted file mode 100644 index 2e78767..0000000 --- a/spice-vdagent-0.15.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5bae1747307c2f4195f6de97639391be7c6be6c5673fdcc9febed6faca22bd34 -size 123527 diff --git a/spice-vdagent-0.16.0.tar.bz2 b/spice-vdagent-0.16.0.tar.bz2 new file mode 100644 index 0000000..1fdb624 --- /dev/null +++ b/spice-vdagent-0.16.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b951646e0bd996afda2d063e706fa2aad2655af5bdd1b6525260ab50be30f7d +size 128174 diff --git a/spice-vdagent-var_run.patch b/spice-vdagent-var_run.patch index e698483..a6317eb 100644 --- a/spice-vdagent-var_run.patch +++ b/spice-vdagent-var_run.patch @@ -5,23 +5,23 @@ data/spice-vdagentd.service | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) -Index: spice-vdagent-0.15.0/Makefile.am +Index: spice-vdagent-0.16.0/Makefile.am =================================================================== ---- spice-vdagent-0.15.0.orig/Makefile.am -+++ spice-vdagent-0.15.0/Makefile.am -@@ -46,7 +46,6 @@ gdmautostartdir = $(datadir)/gdm/autosta - gdmautostart_DATA = $(top_srcdir)/data/spice-vdagent.desktop +--- spice-vdagent-0.16.0.orig/Makefile.am ++++ spice-vdagent-0.16.0/Makefile.am +@@ -55,7 +55,6 @@ gdmautostart2dir = $(datadir)/gdm/autost + gdmautostart2_DATA = $(top_srcdir)/data/spice-vdagent.desktop install-data-local: - $(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd - rsyslogdir = $(sysconfdir)/rsyslog.d - rsyslog_DATA = $(top_srcdir)/data/rsyslog.d/spice-vdagentd.conf -Index: spice-vdagent-0.15.0/Makefile.in + if INIT_SCRIPT_RED_HAT + initdir = $(sysconfdir)/rc.d/init.d +Index: spice-vdagent-0.16.0/Makefile.in =================================================================== ---- spice-vdagent-0.15.0.orig/Makefile.in -+++ spice-vdagent-0.15.0/Makefile.in -@@ -1366,7 +1366,6 @@ uninstall-am: uninstall-binPROGRAMS unin +--- spice-vdagent-0.16.0.orig/Makefile.in ++++ spice-vdagent-0.16.0/Makefile.in +@@ -1413,7 +1413,6 @@ uninstall-am: uninstall-binPROGRAMS unin install-data-local: @@ -29,10 +29,10 @@ Index: spice-vdagent-0.15.0/Makefile.in # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -Index: spice-vdagent-0.15.0/data/spice-vdagentd +Index: spice-vdagent-0.16.0/data/spice-vdagentd =================================================================== ---- spice-vdagent-0.15.0.orig/data/spice-vdagentd -+++ spice-vdagent-0.15.0/data/spice-vdagentd +--- spice-vdagent-0.16.0.orig/data/spice-vdagentd ++++ spice-vdagent-0.16.0/data/spice-vdagentd @@ -37,6 +37,7 @@ start() { [ -x $exec ] || exit 5 [ -c $port ] || exit 0 diff --git a/spice-vdagent.changes b/spice-vdagent.changes index c21de86..c509582 100644 --- a/spice-vdagent.changes +++ b/spice-vdagent.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Jul 21 18:52:21 UTC 2015 - mpluskal@suse.com + +- Update tp 0.16.0 + * Xspice support + * Release clipboard on client disconnect if owned by client + (rhbz#1003977) + * Turn some error messages into debugging messages (rhbz#918310) + * Not having the virtio channel is not an error; instead silently + do nothing +- Cleanup spec file with spec-cleaner +- Actually apply spice-vdagent-var_run.patch + ------------------------------------------------------------------- Wed Jul 9 16:21:19 UTC 2014 - fcrozat@suse.com diff --git a/spice-vdagent.spec b/spice-vdagent.spec index 818aecd..96615b1 100644 --- a/spice-vdagent.spec +++ b/spice-vdagent.spec @@ -1,7 +1,7 @@ # # spec file for package spice-vdagent # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany. # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: spice-vdagent -Version: 0.15.0 +Version: 0.16.0 Release: 0 Summary: Agent for Spice guests License: GPL-3.0+ @@ -26,6 +26,7 @@ Group: Applications/System Url: http://spice-space.org/ Source0: http://spice-space.org/download/releases/%{name}-%{version}.tar.bz2 Patch0: spice-vdagent-var_run.patch +BuildRequires: alsa-devel BuildRequires: desktop-file-utils BuildRequires: glib2-devel BuildRequires: libXfixes-devel @@ -36,8 +37,8 @@ BuildRequires: libtool BuildRequires: spice-protocol-devel >= 0.12.6 BuildRequires: systemd BuildRequires: systemd-devel -%{?systemd_requires} Supplements: modalias(xorg-x11-server:virtio:d00000003v*) +%{?systemd_requires} %description Spice agent for Linux guests offering the following features: @@ -53,9 +54,12 @@ Features: %prep %setup -q +%patch0 -p1 %build -%configure --with-session-info=systemd --with-init-script=systemd +%configure \ + --with-session-info=systemd \ + --with-init-script=systemd make %{?_smp_mflags} V=2 %install