!21 Fix minor spelling errors

From: @ultra_planet 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng

backport-Fix-minor-spelling-errors.patch

@@ -0,0 +1,132 @@
+From a3c361d8292eeef80d0ffebeff6c2a6be35337d7 Mon Sep 17 00:00:00 2001
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Sun, 7 Jul 2024 12:55:55 -0400
+Subject: [PATCH] Fix minor spelling errors.
+
+This change was performed with:
+
+```
+codespell --ignore-words-list 'requestor' -w
+```
+
+("requestor" is part of the X11 API, and if we allow codespell to rewrite it it would fail to build)
+---
+ CHANGELOG.md              | 14 +++++++-------
+ src/vdagent-connection.h  |  2 +-
+ src/vdagent/clipboard.c   |  2 +-
+ src/vdagent/device-info.c |  2 +-
+ src/vdagent/mutter.c      |  2 +-
+ 5 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index e8ef82f..b413fea 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -1,4 +1,4 @@
+-Gitlab markdown format support linking to Issues (#) and Merge requests (!) and more, see bellow:
++Gitlab markdown format support linking to Issues (#) and Merge requests (!) and more, see below:
+ 
+ https://gitlab.freedesktop.org/spice/linux/vd_agent/-/blob/master/CHANGELOG.md
+ 
+@@ -93,7 +93,7 @@ News in spice-vdagent 0.17.0
+ * Set exit code to 1 instead of 0 when virtio device cannot be opened
+ * Fix double-free on uinput->screen_info (rhbz#1262635)
+ * Code improvement over unix domain client server support (udcs)
+-* Fix build compatiblity with different libsystemd versions (fdo#94209)
++* Fix build compatibility with different libsystemd versions (fdo#94209)
+ 
+ News in spice-vdagent 0.16.0
+ ============================
+@@ -117,7 +117,7 @@ News in spice-vdagent 0.15.0
+ News in spice-vdagent 0.14.0
+ ============================
+ 
+-* More multi-monitor and arbritary resolution support bugfixes
++* More multi-monitor and arbitrary resolution support bugfixes
+ * Add support for file transfers from client to guest
+ * Add support for setups with multiple Screens (multiple qxl devices each
+   mapped to their own screen), limitations:
+@@ -131,16 +131,16 @@ News in spice-vdagent 0.14.0
+ News in spice-vdagent 0.12.1
+ ============================
+ 
+-* Various bugfixes for multi-monitor and arbritary resolution support
++* Various bugfixes for multi-monitor and arbitrary resolution support
+ * Requires libXrandr >= 1.3, Note 0.12.0 also required this, but did not
+   check for it. For older distributions use 0.10.1
+ 
+ News in spice-vdagent 0.12.0
+ ============================
+ 
+-* Full multi-monitor and arbritary resolution support, this requires a new
++* Full multi-monitor and arbitrary resolution support, this requires a new
+   enough xorg-x11-drv-qxl driver, as well as a new enough host
+-* systemd service support, using systemd hardware acivation
++* systemd service support, using systemd hardware activation
+ * Use syslog for logging, rather then logging to private log files
+ 
+ News in spice-vdagent 0.10.1
+@@ -165,7 +165,7 @@ News in spice-vdagent 0.8.1
+ * In daemon mode the session vdagent now retries connecting to the system
+   vdagentd every second, once a connection is made a version check is done,
+   if the version differs (which only happens on an upgrade from one version
+-  to the next) the sesion vdagent re-execs itself (Marc-André Lureau)
++  to the next) the session vdagent re-execs itself (Marc-André Lureau)
+ 
+ News in spice-vdagent 0.8.0
+ ===========================
+diff --git a/src/vdagent-connection.h b/src/vdagent-connection.h
+index c515a79..3b79d23 100644
+--- a/src/vdagent-connection.h
++++ b/src/vdagent-connection.h
+@@ -28,7 +28,7 @@ G_BEGIN_DECLS
+ #define VDAGENT_TYPE_CONNECTION vdagent_connection_get_type()
+ G_DECLARE_DERIVABLE_TYPE(VDAgentConnection, vdagent_connection, VDAGENT, CONNECTION, GObject)
+ 
+-/* Sublasses of VDAgentConnection must implement
++/* Subclasses of VDAgentConnection must implement
+  * handle_header and handle_message. */
+ struct _VDAgentConnectionClass {
+     GObjectClass parent_class;
+diff --git a/src/vdagent/clipboard.c b/src/vdagent/clipboard.c
+index ee329ac..8d2de8e 100644
+--- a/src/vdagent/clipboard.c
++++ b/src/vdagent/clipboard.c
+@@ -281,7 +281,7 @@ static void clipboard_contents_received_cb(GtkClipboard     *clipboard,
+                     gtk_selection_data_get_data(sel_data),
+                     gtk_selection_data_get_length(sel_data));
+     } else {
+-        syslog(LOG_WARNING, "%s: sel_id=%u: expected type %u, recieved %u, "
++        syslog(LOG_WARNING, "%s: sel_id=%u: expected type %u, received %u, "
+                             "skipping", __func__, sel_id, target, type);
+         udscs_write(c->conn, VDAGENTD_CLIPBOARD_DATA, sel_id,
+                     VD_AGENT_CLIPBOARD_NONE, NULL, 0);
+diff --git a/src/vdagent/device-info.c b/src/vdagent/device-info.c
+index f07de03..2e5e91f 100644
+--- a/src/vdagent/device-info.c
++++ b/src/vdagent/device-info.c
+@@ -332,7 +332,7 @@ static char* find_device_at_pci_address(PciAddress *pci_addr, int *vendor_id, in
+     g_return_val_if_fail(device_id != NULL, NULL);
+     g_return_val_if_fail(vendor_id != NULL, NULL);
+     // Look for a device that matches the PCI address parsed above. Loop
+-    // through the list of cards reported by the DRM subsytem
++    // through the list of cards reported by the DRM subsystem
+     for (int i = 0; i < 10; ++i) {
+         char dev_path[64];
+         struct stat buf;
+diff --git a/src/vdagent/mutter.c b/src/vdagent/mutter.c
+index f6ff11b..70998bb 100644
+--- a/src/vdagent/mutter.c
++++ b/src/vdagent/mutter.c
+@@ -57,7 +57,7 @@ struct VDAgentMutterDBus {
+  *
+  * Returns:
+  * An initialise VDAgentMutterDBus structure if successful.
+- * NULL if an error occured.
++ * NULL if an error occurred.
+  */
+ VDAgentMutterDBus *vdagent_mutter_create(GHashTable *connector_mapping)
+ {
+-- 
+2.33.0
+

spice-vdagent.spec

@@ -1,12 +1,21 @@
 Name:           spice-vdagent
-Version:        0.18.0
+Version:        0.22.1
-Release:        4
+Release:        2
 Summary:        Agent for Spice guests
 License:        GPLv3+
 URL:            https://spice-space.org/
 Source0:        https://spice-space.org/download/releases/%{name}-%{version}.tar.bz2
-BuildRequires:  systemd-devel glib2-devel spice-protocol libpciaccess-devel libXrandr-devel dbus-devel
+
-BuildRequires:  libXfixes-devel systemd desktop-file-utils libtool libXinerama-devel alsa-lib-devel
+Patch0:         backport-Fix-minor-spelling-errors.patch
+
+BuildRequires:  systemd-devel
+BuildRequires:  glib2-devel >= 2.50
+BuildRequires:  spice-protocol >= 0.14.3
+BuildRequires:  libpciaccess-devel libXrandr-devel libXinerama-devel
+BuildRequires:  libXfixes-devel systemd desktop-file-utils libtool
+BuildRequires:  alsa-lib-devel dbus-devel libdrm-devel
+# For autoreconf, needed after clipboard patch series
+BuildRequires:  automake autoconf
 
 %{?systemd_requires}
 
@@ -19,7 +28,7 @@ installed on domU o.s. to work. The default is 0.
 %package_help
 
 %prep
-%autosetup -n %{name}-%{version}
+%autosetup -n %{name}-%{version} -p1
 
 %build
 %configure --with-session-info=systemd --with-init-script=systemd
@@ -27,6 +36,7 @@ installed on domU o.s. to work. The default is 0.
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT V=2
+%define _unpackaged_files_terminate_build 0
 
 %post
 %systemd_post spice-vdagentd.service spice-vdagentd.socket
@@ -53,10 +63,25 @@ make install DESTDIR=$RPM_BUILD_ROOT V=2
 
 %files help
 %defattr(-,root,root)
-%doc ChangeLog README TODO
+%doc COPYING CHANGELOG.md README.md
 %{_mandir}/man1/*.1.gz
 
 %changelog
+* Wed Jul 31 2024 lingsheng <lingsheng1@h-partners.com> - 0.22.1-2
+- Fix minor spelling errors
+
+* Sun Jul 31 2022 tianlijing <tianlijing@kylinos.cn> - 0.22.1-1
+- upgrade to 0.22.1
+
+* Fri Dec 3 2021 yangcheng <yangcheng87@huawei.com> - 0.21.0-1
+- upgrade to 0.21.0
+
+* Mon Feb 22 2021 jinzhimin <jinzhimin2@huawei.com> - 0.20.0-2
+- fix CVE-2020-25650 CVE-2020-25651 CVE-2020-25652 CVE-2020-25653
+
+* Fri Jul 17 2020 chengguipeng <chengguipeng1@huawei.com> - 0.20.0-1
+- upgrade to 0.20.0
+
 * Fri Oct 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.18.0-4
 - Type:bugfix
 - Id:NA