Update to 1.6.1 (close RHBZ#2243684)

[skip changelog]

.gitignore

@@ -6,5 +6,3 @@
 /wlcs-1.5.0.tar.gz
 /wlcs-1.6.0.tar.gz
 /wlcs-1.6.1.tar.gz
-/wlcs-1.7.0.tar.gz
-/wlcs-1.8.1.tar.gz

sources

@@ -1 +1 @@
-SHA512 (wlcs-1.8.1.tar.gz) = 5a76c9a5b88ab0627300bd9a3cb63ceaf68824a15b79a605aa5fd3a9b12e2877489a7150a21da68bda21434bd947e4f0d1ecc8b6d81ab9a1faf84ee75e6d1ca2
+SHA512 (wlcs-1.6.1.tar.gz) = 136bee6ac1d55e55cbeb65e20cc6e6b1912c5b050bef63d16a869dc90b6e287dddb21d8861f3847811aa804d1e5edbe1de0616ebef888fce335399e249f60bce

wlcs.rpmlintrc

@@ -1,2 +0,0 @@
-# Not a real spelling error:
-addFilter(r" spelling-error \('(implementors?)',")

wlcs.spec

@@ -1,14 +1,14 @@
 # Lists copied from gcc.spec
-# Current as of 16.0.1 (lines 83, 103, and 93, respectively).
+# 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 riscv64
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
 %global arch_has_asan 1
 %endif
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 riscv64
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
 %global arch_has_ubsan 1
 %endif
-%ifarch x86_64 ppc64 ppc64le aarch64 s390x riscv64
+%ifarch x86_64 ppc64 ppc64le aarch64 s390x
 %global arch_has_tsan 1
 %endif
 
@@ -18,7 +18,7 @@
 %bcond tsan 0%{?arch_has_tsan:1}
 
 Name:           wlcs
-Version:        1.8.1
+Version:        1.6.1
 Release:        %autorelease
 Summary:        Wayland Conformance Test Suite
 
@@ -39,7 +39,7 @@ Summary:        Wayland Conformance Test Suite
 #   and these sources are combined with GPLv3 code, the LGPLv3 option is used
 #   in this package. However, we encode both options in the SPDX expression.
 #
-# GPL-2.0-or-later
+# GPLv2+:
 #   - debian/*
 # > Not used in this package
 #
@@ -63,8 +63,8 @@ Summary:        Wayland Conformance Test Suite
 #   - tests/xdg_surface_v6.cpp
 #   - tests/xdg_toplevel_stable.cpp
 #   - tests/xdg_toplevel_v6.cpp
-# > Files in tests/ are included in the test-suite executables and do
-#   contribute to the licenses of the binary RPMs. Files in src/protocol/ are
+# > Files in tests/ are all test code that is not installed (so does not
+#   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.
 #
@@ -73,32 +73,16 @@ Summary:        Wayland Conformance Test Suite
 # > 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) AND MIT
-SourceLicense:  %{shrink:
-    %{license} AND
-    (GPL-2.0-only OR GPL-3.0-only) AND
-    GPL-2.0-or-later AND
-    HPND-sell-variant
-    }
+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
 
-BuildSystem:    cmake
-# WLCS_FATAL_COMPILE_WARNINGS: makes sense for upstream CI, but too strict for
-#                              downstream packaging
-BuildOption(conf): %{shrink:
-    -DWLCS_BUILD_ASAN=%{?with_asan:ON}%{?!with_asan:OFF}
-    -DWLCS_BUILD_TSAN=%{?with_tsan:ON}%{?!with_tsan:OFF}
-    -DWLCS_BUILD_UBSAN=%{?with_ubsan:ON}%{?!with_ubsan:OFF}
-    -DWLCS_FATAL_COMPILE_WARNINGS:BOOL=OFF
-    }
-# We have built a test suite for compositors, but we have no tests for the test
-# suite, i.e., %%ctest would find no tests and there is nothing useful we could
-# do in %%check.
-
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 
+BuildRequires:  cmake
+BuildRequires:  ninja-build
+
 BuildRequires:  boost-devel
 BuildRequires:  cmake(GTest)
 BuildRequires:  gmock-devel
@@ -145,6 +129,29 @@ The wlcs-devel package contains libraries and header files for developing
 Wayland compositor tests that use wlcs.
 
 
+%prep
+%autosetup
+# -Werror makes sense for upstream CI, but is too strict for packaging
+sed -r -i 's/-Werror //' CMakeLists.txt
+
+
+%build
+%cmake \
+    -DWLCS_BUILD_ASAN=%{?with_asan:ON}%{?!with_asan:OFF} \
+    -DWLCS_BUILD_TSAN=%{?with_tsan:ON}%{?!with_tsan:OFF} \
+    -DWLCS_BUILD_UBSAN=%{?with_ubsan:ON}%{?!with_ubsan:OFF} \
+    -GNinja
+%cmake_build
+
+
+%install
+%cmake_install
+
+
+%check
+%ctest
+
+
 %files
 %license COPYING.*
 %doc README.rst