From 813544d000923bc02979e3dc3eac77979adbb768 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 20 Jan 2023 13:16:32 -0500
Subject: [PATCH 1/7] Update to 1.5.0 (close RHBZ#2162721)

---
 .gitignore |  1 +
 sources    |  2 +-
 wlcs.spec  | 10 ++++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 09c567f..555c23d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /wlcs-1.2.0.tar.xz
 /wlcs-1.3.0.tar.xz
 /wlcs-1.4.0.tar.xz
+/wlcs-1.5.0.tar.gz
diff --git a/sources b/sources
index b90c256..0527ac4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wlcs-1.4.0.tar.xz) = a6707f730b499cb1927ad9b3acbdb561e0788f201ffde472fafd7d427b8ee7195b9b0adc14b7c621c87afc0c13056e3ed69d53dd347178e302dc58b9bbb87b6e
+SHA512 (wlcs-1.5.0.tar.gz) = 2d05f62ccfbbd0c4300556e7713b086663678b2ee87fe8297cb7c81a482d23fa7948034da494f91609b954c11e350d4e52837217fbafeaba2a694de7828480b6
diff --git a/wlcs.spec b/wlcs.spec
index 112fbdc..192a0a2 100644
--- a/wlcs.spec
+++ b/wlcs.spec
@@ -25,7 +25,7 @@
 %endif
 
 Name:           wlcs
-Version:        1.4.0
+Version:        1.5.0
 Release:        %autorelease
 Summary:        Wayland Conformance Test Suite
 
@@ -55,12 +55,14 @@ Summary:        Wayland Conformance Test Suite
 #   - src/protocol/primary-selection-unstable-v1.xml
 #   - src/protocol/relative-pointer-unstable-v1.xml
 #   - src/protocol/wayland.xml
+#   - src/protocol/wlr-virtual-pointer-unstable-v1.xml
 #   - src/protocol/xdg-output-unstable-v1.xml
 #   - src/protocol/xdg-shell-unstable-v6.xml
 #   - src/protocol/xdg-shell.xml
 #   - tests/test_bad_buffer.cpp
 #   - tests/test_surface_events.cpp
 #   - tests/text_input_v3_with_input_method_v2.cpp
+#   - tests/wlr_virtual_pointer_v1.cpp
 #   - tests/xdg_popup_v6.cpp
 #   - tests/xdg_surface_stable.cpp
 #   - tests/xdg_surface_v6.cpp
@@ -72,7 +74,7 @@ Summary:        Wayland Conformance Test Suite
 #   and are not directly included in the binary RPMs.
 License:        GPL-3.0-only AND (LGPL-2.0-only OR LGPL-3.0-only)
 URL:            https://github.com/MirServer/wlcs
-Source0:        %{url}/releases/download/v%{version}/wlcs-%{version}.tar.xz
+Source0:        %{url}/archive/v%{version}/wlcs-%{version}.tar.gz
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -145,6 +147,10 @@ sed -r -i 's/-Werror //' CMakeLists.txt
 %cmake_install
 
 
+%check
+%ctest
+
+
 %files
 %license COPYING.*
 %doc README.rst

From 7ec9d21b3ae17d8af28e3f2800a2a89c33440936 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 20 Jan 2023 13:10:47 -0500
Subject: [PATCH 2/7] Confirm lib*san architectures for GCC 13

---
 wlcs.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wlcs.spec b/wlcs.spec
index 192a0a2..8f23bf6 100644
--- a/wlcs.spec
+++ b/wlcs.spec
@@ -1,5 +1,5 @@
 # List copied from gcc.spec
-# Current as of 12.2.1 (line 60)
+# Current as of 13.0.1 (line 66)
 # Note that this covers all Fedora primary architectures.
 %ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
 %bcond_without asan
@@ -8,7 +8,7 @@
 %endif
 
 # List copied from gcc.spec
-# Current as of 12.2.1 (line 75)
+# Current as of 13.0.1 (line 86)
 # Note that this covers all Fedora primary architectures.
 %ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
 %bcond_without ubsan
@@ -17,7 +17,7 @@
 %endif
 
 # List copied from gcc.spec
-# Current as of 12.2.1 (line 65)
+# Current as of 13.0.1 (line 76)
 %ifarch x86_64 ppc64 ppc64le aarch64 s390x
 %bcond_without tsan
 %else

From db4ea79fba79fff3abe2a8b6e88dad5e2c4731a7 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 29 May 2023 13:11:34 -0400
Subject: [PATCH 3/7] Do not number the sole Source

[skip changelog]
---
 wlcs.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wlcs.spec b/wlcs.spec
index 8f23bf6..be0c5d3 100644
--- a/wlcs.spec
+++ b/wlcs.spec
@@ -74,7 +74,7 @@ Summary:        Wayland Conformance Test Suite
 #   and are not directly included in the binary RPMs.
 License:        GPL-3.0-only AND (LGPL-2.0-only OR LGPL-3.0-only)
 URL:            https://github.com/MirServer/wlcs
-Source0:        %{url}/archive/v%{version}/wlcs-%{version}.tar.gz
+Source:         %{url}/archive/v%{version}/wlcs-%{version}.tar.gz
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++

From a9ced99c7d71ffee6fd762e7462d86f0b3b18240 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Sun, 18 Jun 2023 12:08:33 -0400
Subject: [PATCH 4/7] Use new (rpm 4.17.1+) bcond style

---
 wlcs.spec | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/wlcs.spec b/wlcs.spec
index be0c5d3..96e0870 100644
--- a/wlcs.spec
+++ b/wlcs.spec
@@ -2,26 +2,26 @@
 # Current as of 13.0.1 (line 66)
 # Note that this covers all Fedora primary architectures.
 %ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
-%bcond_without asan
+%bcond asan 1
 %else
-%bcond_with asan
+%bcond asan 0
 %endif
 
 # List copied from gcc.spec
 # Current as of 13.0.1 (line 86)
 # Note that this covers all Fedora primary architectures.
 %ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
-%bcond_without ubsan
+%bcond ubsan 1
 %else
-%bcond_with ubsan
+%bcond ubsan 0
 %endif
 
 # List copied from gcc.spec
 # Current as of 13.0.1 (line 76)
 %ifarch x86_64 ppc64 ppc64le aarch64 s390x
-%bcond_without tsan
+%bcond tsan 1
 %else
-%bcond_with tsan
+%bcond tsan 0
 %endif
 
 Name:           wlcs

From c07b955e71915b09ee2dd5b2a5922474cfb1632e Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Wed, 19 Jul 2023 08:51:23 -0400
Subject: [PATCH 5/7] Update to 1.6.0 (close RHBZ#2223843)

---
 .gitignore | 1 +
 sources    | 2 +-
 wlcs.spec  | 9 +++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 555c23d..0aa0e0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /wlcs-1.3.0.tar.xz
 /wlcs-1.4.0.tar.xz
 /wlcs-1.5.0.tar.gz
+/wlcs-1.6.0.tar.gz
diff --git a/sources b/sources
index 0527ac4..f6b8ddc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wlcs-1.5.0.tar.gz) = 2d05f62ccfbbd0c4300556e7713b086663678b2ee87fe8297cb7c81a482d23fa7948034da494f91609b954c11e350d4e52837217fbafeaba2a694de7828480b6
+SHA512 (wlcs-1.6.0.tar.gz) = ae6d83e20d7bd08123936ca5c0ac7d8d8c531240f17084a3d8610dec5708c9bd32b6a667c914b6ba2117e187baaef58e02f95d919ea46de5f01ad4dfd10a4f83
diff --git a/wlcs.spec b/wlcs.spec
index 96e0870..917abe3 100644
--- a/wlcs.spec
+++ b/wlcs.spec
@@ -1,5 +1,5 @@
 # List copied from gcc.spec
-# Current as of 13.0.1 (line 66)
+# Current as of 13.1.1 (line 66)
 # Note that this covers all Fedora primary architectures.
 %ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
 %bcond asan 1
@@ -8,7 +8,7 @@
 %endif
 
 # List copied from gcc.spec
-# Current as of 13.0.1 (line 86)
+# Current as of 13.1.1 (line 86)
 # Note that this covers all Fedora primary architectures.
 %ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
 %bcond ubsan 1
@@ -17,7 +17,7 @@
 %endif
 
 # List copied from gcc.spec
-# Current as of 13.0.1 (line 76)
+# Current as of 13.1.1 (line 76)
 %ifarch x86_64 ppc64 ppc64le aarch64 s390x
 %bcond tsan 1
 %else
@@ -25,7 +25,7 @@
 %endif
 
 Name:           wlcs
-Version:        1.5.0
+Version:        1.6.0
 Release:        %autorelease
 Summary:        Wayland Conformance Test Suite
 
@@ -37,6 +37,7 @@ Summary:        Wayland Conformance Test Suite
 #   RPMs
 #
 # (LGPL-2.0-only OR LGPL-3.0-only):
+#   - include/geometry/*
 #   - include/mutex.h
 #   - include/shared_library.h
 #   - src/helpers.cpp

From d3d63e1f8cf3980d6d4cf0ad4b2df3004e54542d Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 17 Oct 2023 11:59:48 -0400
Subject: [PATCH 6/7] Reorganize sanitizer conditionals

---
 wlcs.spec | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/wlcs.spec b/wlcs.spec
index 917abe3..4d77592 100644
--- a/wlcs.spec
+++ b/wlcs.spec
@@ -1,29 +1,22 @@
-# List copied from gcc.spec
-# Current as of 13.1.1 (line 66)
-# Note that this covers all Fedora primary architectures.
+# Lists copied from gcc.spec
+# Current as of 13.2.1 (lines 66, 86, and 76, respectively).
+# Note that asan and ubsan are available on all Fedora primary architectures;
+# tsan is missing on i686 only.
 %ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
-%bcond asan 1
-%else
-%bcond asan 0
+%global arch_has_asan 1
 %endif
-
-# List copied from gcc.spec
-# Current as of 13.1.1 (line 86)
-# Note that this covers all Fedora primary architectures.
 %ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
-%bcond ubsan 1
-%else
-%bcond ubsan 0
+%global arch_has_ubsan 1
 %endif
-
-# List copied from gcc.spec
-# Current as of 13.1.1 (line 76)
 %ifarch x86_64 ppc64 ppc64le aarch64 s390x
-%bcond tsan 1
-%else
-%bcond tsan 0
+%global arch_has_tsan 1
 %endif
 
+# By default, enable sanitizers whenever they are available on the architecture.
+%bcond asan 0%{?arch_has_asan:1}
+%bcond ubsan 0%{?arch_has_ubsan:1}
+%bcond tsan 0%{?arch_has_tsan:1}
+
 Name:           wlcs
 Version:        1.6.0
 Release:        %autorelease

From c16f2ab66115b8cb2733081f3e579e18933d60da Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 17 Oct 2023 12:33:13 -0400
Subject: [PATCH 7/7] Update to 1.6.1 (close RHBZ#2243684)

---
 .gitignore | 1 +
 sources    | 2 +-
 wlcs.spec  | 9 ++++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0aa0e0e..7e441d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /wlcs-1.4.0.tar.xz
 /wlcs-1.5.0.tar.gz
 /wlcs-1.6.0.tar.gz
+/wlcs-1.6.1.tar.gz
diff --git a/sources b/sources
index f6b8ddc..dbf128a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wlcs-1.6.0.tar.gz) = ae6d83e20d7bd08123936ca5c0ac7d8d8c531240f17084a3d8610dec5708c9bd32b6a667c914b6ba2117e187baaef58e02f95d919ea46de5f01ad4dfd10a4f83
+SHA512 (wlcs-1.6.1.tar.gz) = 136bee6ac1d55e55cbeb65e20cc6e6b1912c5b050bef63d16a869dc90b6e287dddb21d8861f3847811aa804d1e5edbe1de0616ebef888fce335399e249f60bce
diff --git a/wlcs.spec b/wlcs.spec
index 4d77592..9288405 100644
--- a/wlcs.spec
+++ b/wlcs.spec
@@ -18,7 +18,7 @@
 %bcond tsan 0%{?arch_has_tsan:1}
 
 Name:           wlcs
-Version:        1.6.0
+Version:        1.6.1
 Release:        %autorelease
 Summary:        Wayland Conformance Test Suite
 
@@ -45,6 +45,7 @@ Summary:        Wayland Conformance Test Suite
 #
 # MIT:
 #   - src/protocol/gtk-primary-selection.xml
+#   - src/protocol/input-method-unstable-v1.xml
 #   - src/protocol/pointer-constraints-unstable-v1.xml
 #   - src/protocol/primary-selection-unstable-v1.xml
 #   - src/protocol/relative-pointer-unstable-v1.xml
@@ -66,6 +67,12 @@ Summary:        Wayland Conformance Test Suite
 #   contribute to the licenses of the binary RPMs). Files in src/protocol/ are
 #   used as inputs to “wayland-scanner” to generate C source files and headers,
 #   and are not directly included in the binary RPMs.
+#
+# HPND-sell-variant:
+#   - src/protocol/text-input-unstable-v2.xml
+# > Files in src/protocol/ are used as inputs to “wayland-scanner” to generate
+#   C source files and headers, and are not directly included in the binary
+#   RPMs.
 License:        GPL-3.0-only AND (LGPL-2.0-only OR LGPL-3.0-only)
 URL:            https://github.com/MirServer/wlcs
 Source:         %{url}/archive/v%{version}/wlcs-%{version}.tar.gz