diff --git a/wlcs.rpmlintrc b/wlcs.rpmlintrc
index 99ea686..499c66f 100644
--- a/wlcs.rpmlintrc
+++ b/wlcs.rpmlintrc
@@ -1,6 +1,2 @@
 # Not a real spelling error:
 addFilter(r" spelling-error \('(implementors?)',")
-# Use the latest GPLv2 license text
-# https://github.com/canonical/wlcs/pull/352
-# We will not patch this until/unless upstream merges the PR.
-addFilter(r" incorrect-fsf-address ")
diff --git a/wlcs.spec b/wlcs.spec
index 221504a..7dca8f9 100644
--- a/wlcs.spec
+++ b/wlcs.spec
@@ -1,5 +1,5 @@
 # Lists copied from gcc.spec
-# Current as of 15.2.1 (lines 74, 94, and 84, respectively).
+# Current as of 16.0.1 (lines 83, 103, and 93, 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
@@ -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 all test code that is not installed (so does not
-#   contribute to the licenses of the binary RPMs). Files in src/protocol/ are
+# > 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
 #   used as inputs to “wayland-scanner” to generate C source files and headers,
 #   and are not directly included in the binary RPMs.
 #
@@ -73,23 +73,32 @@ 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)
+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 AND
-                MIT
-                }
+    %{license} AND
+    (GPL-2.0-only OR GPL-3.0-only) AND
+    GPL-2.0-or-later AND
+    HPND-sell-variant
+    }
 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
@@ -136,33 +145,6 @@ The wlcs-devel package contains libraries and header files for developing
 Wayland compositor tests that use wlcs.
 
 
-%prep
-%autosetup
-
-
-%conf
-# WLCS_FATAL_COMPILE_WARNINGS: makes sense for upstream CI, but too strict for
-#                              downstream packaging
-%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} \
-    -DWLCS_FATAL_COMPILE_WARNINGS:BOOL=OFF \
-    -GNinja
-
-
-%build
-%cmake_build
-
-
-%install
-%cmake_install
-
-
-%check
-%ctest
-
-
 %files
 %license COPYING.*
 %doc README.rst