From cf89c240382aecbfd66e63dbf4e5e909917df35df8a95db0646535b7c8ec8acb Mon Sep 17 00:00:00 2001
From: Bruce Rogers <brogers@suse.com>
Date: Tue, 17 Dec 2019 17:11:16 +0000
Subject: [PATCH] Accepting request 757596 from
 home:bfrogers:branches:Virtualization

- Since the 0.19.0 update, this patch is no longer needed:
  spice-vdagent-var_run.patch
- For sometime now we've not had any rsyslog config files, so clean
  up where the spec file would remove the rsyslog.d dir and content

OBS-URL: https://build.opensuse.org/request/show/757596
OBS-URL: https://build.opensuse.org/package/show/Virtualization/spice-vdagent?expand=0&rev=31
---
 spice-vdagent-var_run.patch | 30 ------------------------------
 spice-vdagent.changes       |  8 ++++++++
 spice-vdagent.spec          |  6 +-----
 3 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 spice-vdagent-var_run.patch

diff --git a/spice-vdagent-var_run.patch b/spice-vdagent-var_run.patch
deleted file mode 100644
index 31861a7..0000000
--- a/spice-vdagent-var_run.patch
+++ /dev/null
@@ -1,30 +0,0 @@
----
- Makefile.am                 |    1 -
- data/spice-vdagentd         |    1 +
- data/spice-vdagentd.service |    1 +
- 3 files changed, 2 insertions(+), 1 deletion(-)
-
-Index: spice-vdagent-0.16.0/Makefile.am
-===================================================================
---- 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
- 
- if INIT_SCRIPT_RED_HAT
- initdir = $(sysconfdir)/rc.d/init.d
-Index: spice-vdagent-0.16.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
-     modprobe uinput > /dev/null 2>&1
-+    mkdir -p /run/spice-vdagentd
-     # In case the previous running vdagentd crashed
-     rm -f /run/spice-vdagentd/spice-vdagent-sock
-     echo -n $"Starting $prog: "
diff --git a/spice-vdagent.changes b/spice-vdagent.changes
index 290898f..97e5d26 100644
--- a/spice-vdagent.changes
+++ b/spice-vdagent.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Dec 17 16:51:54 UTC 2019 - Bruce Rogers <brogers@suse.com>
+
+- Since the 0.19.0 update, this patch is no longer needed:
+  spice-vdagent-var_run.patch
+- For sometime now we've not had any rsyslog config files, so clean
+  up where the spec file would remove the rsyslog.d dir and content
+
 -------------------------------------------------------------------
 Wed Dec 11 17:33:36 UTC 2019 - Bruce Rogers <brogers@suse.com>
 
diff --git a/spice-vdagent.spec b/spice-vdagent.spec
index 63173fb..574bee4 100644
--- a/spice-vdagent.spec
+++ b/spice-vdagent.spec
@@ -27,8 +27,7 @@ URL:            http://spice-space.org/
 Source:         http://spice-space.org/download/releases/%{name}-%{version}.tar.bz2
 Source1:        http://spice-space.org/download/releases/%{name}-%{version}.tar.bz2.sig
 Source2:        %{name}.keyring
-Patch0:         spice-vdagent-var_run.patch
-Patch1:         vdagentd-Fix-session-lookup-for-new-GNOME-versions.patch
+Patch0:         vdagentd-Fix-session-lookup-for-new-GNOME-versions.patch
 BuildRequires:  alsa-devel  >= 1.0.22
 BuildRequires:  desktop-file-utils
 BuildRequires:  glib2-devel
@@ -62,7 +61,6 @@ Features:
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %configure \
@@ -72,8 +70,6 @@ make %{?_smp_mflags} V=2
 
 %install
 make install DESTDIR=%{buildroot} V=2
-# remove rsyslogd config
-rm -rf %{buildroot}%{_sysconfdir}/rsyslog.d
 # create rc symlink
 ln -s  service %{buildroot}%{_sbindir}/rcspice-vdagentd