From a3cc806bcee868ed53f7154aa0e6e7ad4396d401 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 20 May 2026 07:52:59 +0100 Subject: [PATCH 1/6] Use the cmake declarative buildsystem --- wlcs.spec | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/wlcs.spec b/wlcs.spec index 8523ef4..a1bb391 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -1,3 +1,5 @@ +%bcond ctest 1 + # Lists copied from gcc.spec # Current as of 16.0.1 (lines 83, 103, and 93, respectively). # Note that asan and ubsan are available on all Fedora primary architectures; @@ -84,7 +86,16 @@ SourceLicense: %{shrink: URL: https://github.com/MirServer/wlcs Source: %{url}/archive/v%{version}/wlcs-%{version}.tar.gz -BuildRequires: cmake +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 + } + BuildRequires: gcc BuildRequires: gcc-c++ @@ -134,32 +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 - - -%build -%cmake_build - - -%install -%cmake_install - - -%check -%ctest - - %files %license COPYING.* %doc README.rst From 1b68f5d49f119145705fd42e0bf49845adf789e5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 20 May 2026 14:03:42 +0100 Subject: [PATCH 2/6] Be more clear that we have no tests of our own --- wlcs.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wlcs.spec b/wlcs.spec index a1bb391..21abbe2 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -1,5 +1,3 @@ -%bcond ctest 1 - # Lists copied from gcc.spec # Current as of 16.0.1 (lines 83, 103, and 93, respectively). # Note that asan and ubsan are available on all Fedora primary architectures; @@ -95,6 +93,9 @@ BuildOption(conf): %{shrink: -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++ From 09988eb145505132f472f574c2605240750b8883 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 20 May 2026 14:54:06 +0100 Subject: [PATCH 3/6] Fix License field (add MIT term) --- wlcs.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/wlcs.spec b/wlcs.spec index 21abbe2..7dca8f9 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -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,13 +73,12 @@ 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 + HPND-sell-variant } URL: https://github.com/MirServer/wlcs Source: %{url}/archive/v%{version}/wlcs-%{version}.tar.gz From b0278d4bfccc4774b1fcb6c1915e0a9c0894daae Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 20 May 2026 14:03:42 +0100 Subject: [PATCH 4/6] Be more clear that we have no tests of our own --- wlcs.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wlcs.spec b/wlcs.spec index 8523ef4..2744112 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -85,6 +85,7 @@ URL: https://github.com/MirServer/wlcs Source: %{url}/archive/v%{version}/wlcs-%{version}.tar.gz BuildRequires: cmake + BuildRequires: gcc BuildRequires: gcc-c++ @@ -156,8 +157,9 @@ Wayland compositor tests that use wlcs. %cmake_install -%check -%ctest +# 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. %files From 7da4098329e616270a39ef49a8c7b3c1061c74a1 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 20 May 2026 14:54:06 +0100 Subject: [PATCH 5/6] Fix License field (add MIT term) --- wlcs.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/wlcs.spec b/wlcs.spec index 2744112..72d00f0 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -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,13 +73,12 @@ 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 + HPND-sell-variant } URL: https://github.com/MirServer/wlcs Source: %{url}/archive/v%{version}/wlcs-%{version}.tar.gz From 8d3af92bb180ed113ff986e27ab7b6e6d57d749b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:51:29 +0000 Subject: [PATCH 6/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild