From 623e937f1e46c4dd91745a3ccb4dd8597df4828e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:34:35 +0000 Subject: [PATCH 01/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wlcs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wlcs.spec b/wlcs.spec index f811c2f..458ffd0 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -19,7 +19,7 @@ Name: wlcs Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Conformance Test Suite License: GPLv2 or GPLv3 @@ -103,6 +103,9 @@ developing Wayland compositor tests that use %{name}. %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Nov 1 2020 Neal Gompa - 1.2.0-1 - Update to 1.2.0 (RH#1893144) From f428cd72c6b0b00c254e58369c8ae63b586d2b9a Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 24 Jun 2021 13:50:15 -0400 Subject: [PATCH 02/46] Update to 1.3.0 (RH#1931861) --- .gitignore | 1 + sources | 2 +- wlcs.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b0116e6..f2ea7d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /wlcs-1.0.0.tar.xz /wlcs-1.1.0.tar.xz /wlcs-1.2.0.tar.xz +/wlcs-1.3.0.tar.xz diff --git a/sources b/sources index 8b2b1dc..483acbf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wlcs-1.2.0.tar.xz) = 220cac5b9c41cadfabdf53f3bde5eec8f57ce0ad37334bf93cf04461377e17f2a705823933128cf54376c04005c483b8561ee733272abca26490bcccb55bdbfd +SHA512 (wlcs-1.3.0.tar.xz) = 3c4ffd9fa1a087fe58912792f0747884bc42bb344be07e937079d399d2bf85c0e9e445880d8e503bad0028c48ffbf2338174c3c74faee5057bf62ff7f121f0de diff --git a/wlcs.spec b/wlcs.spec index 458ffd0..5176ad8 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -18,8 +18,8 @@ %endif Name: wlcs -Version: 1.2.0 -Release: 2%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Summary: Wayland Conformance Test Suite License: GPLv2 or GPLv3 @@ -103,6 +103,9 @@ developing Wayland compositor tests that use %{name}. %changelog +* Thu Jun 24 2021 Neal Gompa - 1.3.0-1 +- Update to 1.3.0 (RH#1931861) + * Wed Jan 27 2021 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 7c8df544219327e5e6c5885e7a3cab61ebfa1e31 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:01:52 +0000 Subject: [PATCH 03/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wlcs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wlcs.spec b/wlcs.spec index 5176ad8..371baba 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -19,7 +19,7 @@ Name: wlcs Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Conformance Test Suite License: GPLv2 or GPLv3 @@ -103,6 +103,9 @@ developing Wayland compositor tests that use %{name}. %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jun 24 2021 Neal Gompa - 1.3.0-1 - Update to 1.3.0 (RH#1931861) From 8bae7df04083c260c7b18d9045757d7a79c77d70 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 2 Nov 2021 22:19:22 +0900 Subject: [PATCH 04/46] Backport upstream patch to build with gtest 1.11 --- wlcs-1.3.0-gtest-1.11.patch | 49 +++++++++++++++++++++++++++++++++++++ wlcs.spec | 7 +++++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 wlcs-1.3.0-gtest-1.11.patch diff --git a/wlcs-1.3.0-gtest-1.11.patch b/wlcs-1.3.0-gtest-1.11.patch new file mode 100644 index 0000000..31981c6 --- /dev/null +++ b/wlcs-1.3.0-gtest-1.11.patch @@ -0,0 +1,49 @@ +From f6ff93f7b7db154b7899f415ec67677e6ddd7ff5 Mon Sep 17 00:00:00 2001 +From: Victor Berger +Date: Thu, 8 Jul 2021 19:39:30 +0200 +Subject: [PATCH] Fix build when using GTest-1.11 + +Some change in GTest 1.11 headers caused a conflict on the name +`Pointer`. Removing the unconditional import of namespace `testing` +in favor of individual imports of the used items fixes it. + +cc #205 +--- + tests/pointer_constraints.cpp | 6 +++++- + tests/relative_pointer.cpp | 6 +++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/tests/pointer_constraints.cpp b/tests/pointer_constraints.cpp +index d306710..6ee856f 100644 +--- a/tests/pointer_constraints.cpp ++++ b/tests/pointer_constraints.cpp +@@ -24,7 +24,11 @@ + + #include + +-using namespace testing; ++using testing::AnyNumber; ++using testing::Eq; ++using testing::Ne; ++using testing::NotNull; ++ + using namespace wlcs; + + namespace +diff --git a/tests/relative_pointer.cpp b/tests/relative_pointer.cpp +index c33316c..c5c5358 100644 +--- a/tests/relative_pointer.cpp ++++ b/tests/relative_pointer.cpp +@@ -22,7 +22,11 @@ + + #include + +-using namespace testing; ++using testing::AnyNumber; ++using testing::IsTrue; ++using testing::NotNull; ++using testing::_; ++ + using namespace wlcs; + + namespace diff --git a/wlcs.spec b/wlcs.spec index 371baba..77f3236 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -19,12 +19,14 @@ Name: wlcs Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wayland Conformance Test Suite License: GPLv2 or GPLv3 URL: https://github.com/MirServer/%{name} Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz +# https://github.com/MirServer/wlcs/commit/f6ff93f7b7db154b7899f415ec67677e6ddd7ff5 +Patch0: wlcs-1.3.0-gtest-1.11.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -103,6 +105,9 @@ developing Wayland compositor tests that use %{name}. %changelog +* Tue Nov 2 2021 Mamoru TASAKA - 1.3.0-3 +- Backport upstream patch to build with gtest 1.11 + * Fri Jul 23 2021 Fedora Release Engineering - 1.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 3eb2210d0ab4ca368081311161c5379c73fee6d9 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 2 Nov 2021 13:57:41 -0400 Subject: [PATCH 05/46] Rebuild for gtest 1.11.0 (fix RHBZ#2001358) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove obsolete macros and workarounds - Update architecture lists for sanitizers - Audit source licenses and correct License from “GPLv2 or GPLv3” to “GPLv3” - Drop license files from -devel since it depends on the base package - Reduce macro indirection in the spec file - Use more pkgconfig(…) and cmake(…) dependencies where appropriate - Package README.rst in -devel package only, and also package example/ - Fix a trivial typo in README.rst and the package description --- 215.patch | 26 +++ ...93f7b7db154b7899f415ec67677e6ddd7ff5.patch | 0 wlcs.spec | 175 +++++++++++++----- 3 files changed, 152 insertions(+), 49 deletions(-) create mode 100644 215.patch rename wlcs-1.3.0-gtest-1.11.patch => f6ff93f7b7db154b7899f415ec67677e6ddd7ff5.patch (100%) diff --git a/215.patch b/215.patch new file mode 100644 index 0000000..6dfbf93 --- /dev/null +++ b/215.patch @@ -0,0 +1,26 @@ +From 6aa1becb3cee328f715af76d16de544974b6646e Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Tue, 2 Nov 2021 13:40:07 -0400 +Subject: [PATCH] =?UTF-8?q?Fix=20a=20trivial=20typo=20(=E2=80=9Caid?= + =?UTF-8?q?=E2=80=9D=20for=20=E2=80=9Cand=E2=80=9D)=20in=20README.rst?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + README.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/README.rst b/README.rst +index 50f8ec1f..7656dc30 100644 +--- a/README.rst ++++ b/README.rst +@@ -25,7 +25,7 @@ happens-before ordering available. + + Instead, ``wlcs`` relies on compositors providing an integration module, + providing ``wlcs`` with API hooks to start a compositor, connect a client, +-move a window, and so on. This makes both writing aid debugging tests easier - ++move a window, and so on. This makes both writing and debugging tests easier - + the tests are (generally) in the same address space as the compositor, so there + is a consistent global clock available, it's easier to poke around in + compositor internals, and standard debugging tools can follow control flow from diff --git a/wlcs-1.3.0-gtest-1.11.patch b/f6ff93f7b7db154b7899f415ec67677e6ddd7ff5.patch similarity index 100% rename from wlcs-1.3.0-gtest-1.11.patch rename to f6ff93f7b7db154b7899f415ec67677e6ddd7ff5.patch diff --git a/wlcs.spec b/wlcs.spec index 77f3236..802c55e 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -1,45 +1,105 @@ -%undefine __cmake_in_source_build - -%if 0%{?fedora} >= 30 -# asan doesn't work with gcc9 on s390x... -%ifarch s390 s390x -%bcond_with asan -%else +# List copied from gcc.spec +# Current as of 11.2.1 (line 59) +# Note that this covers all Fedora primary architectures. +%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %bcond_without asan -%endif -%endif - -%bcond_without ubsan - -%ifarch %{ix86} %{arm} s390 s390x -%bcond_with tsan %else +%bcond_with asan +%endif + +# List copied from gcc.spec +# Current as of 11.2.1 (line 74) +# Note that this covers all Fedora primary architectures. +%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 +%bcond_without ubsan +%else +%bcond_with ubsan +%endif + +# List copied from gcc.spec +# Current as of 11.2.1 (line 64) +%ifarch x86_64 ppc64 ppc64le aarch64 %bcond_without tsan +%else +%bcond_with tsan %endif Name: wlcs Version: 1.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Wayland Conformance Test Suite -License: GPLv2 or GPLv3 -URL: https://github.com/MirServer/%{name} -Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz -# https://github.com/MirServer/wlcs/commit/f6ff93f7b7db154b7899f415ec67677e6ddd7ff5 -Patch0: wlcs-1.3.0-gtest-1.11.patch +# The entire source is GPLv3, except: +# +# (GPLv2 or GPLv3): +# - CMakeLists.txt +# > Build system file that does not contribute to the licenses of the binary +# RPMs +# +# (LGPLv2 or LGPLv3): +# - include/mutex.h +# - include/shared_library.h +# - src/helpers.cpp +# - src/shared_library.cpp +# > Since (L)GPLv2-only code is not compatible with (L)GPLv3 or (L)GPLv3+ code, +# and these sources are combined with GPLv3 code, the LGPLv3 option is used +# in this package. +# +# GPLv2+: +# - debian/* +# > Not used in this package +# +# MIT: +# - src/protocol/gtk-primary-selection.xml +# - src/protocol/pointer-constraints-unstable-v1.xml +# - src/protocol/primary-selection-unstable-v1.xml +# - src/protocol/relative-pointer-unstable-v1.xml +# - src/protocol/wayland.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/xdg_popup_v6.cpp +# - tests/xdg_surface_stable.cpp +# - 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 +# used as inputs to “wayland-scanner” to generate C source files and headers, +# and are not directly included in the binary RPMs. +# +# Thus, files under GPLv3 and (LGPLv2 or LGPLv3) licenses contribute to the +# installed binaries, and the effective license remains GPLv3. +License: GPLv3 +URL: https://github.com/MirServer/wlcs +Source0: %{url}/releases/download/v%{version}/wlcs-%{version}.tar.xz +# Backport upstream commit f6ff93f7b7db154b7899f415ec67677e6ddd7ff5: +# +# Fix build when using GTest-1.11 +# +# Some change in GTest 1.11 headers caused a conflict on the name +# `Pointer`. Removing the unconditional import of namespace `testing` +# in favor of individual imports of the used items fixes it. +Patch0: %{url}/commit/f6ff93f7b7db154b7899f415ec67677e6ddd7ff5.patch +# Fix a trivial typo (“aid” for “and”) in README.rst +# https://github.com/MirServer/wlcs/pull/215 +Patch1: %{url}/pull/215.patch BuildRequires: gcc BuildRequires: gcc-c++ + BuildRequires: cmake BuildRequires: ninja-build + BuildRequires: boost-devel -BuildRequires: gtest-devel +BuildRequires: cmake(GTest) BuildRequires: gmock-devel BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-server) -BuildRequires: %{_bindir}/wayland-scanner -# Because for some reason they're not pulled in normally? -BuildRequires: libatomic +BuildRequires: pkgconfig(wayland-scanner) + %if %{with asan} BuildRequires: libasan %endif @@ -51,34 +111,31 @@ BuildRequires: libtsan %endif %description -wlcs aspires to be a protocol-conformance-verifying test suite -usable by Wayland compositor implementors. +wlcs aspires to be a protocol-conformance-verifying test suite usable by +Wayland compositor implementors. -It is growing out of porting the existing Weston test suite to -be run in Mir's test suite, but it is designed to be usable by -any compositor. +It is growing out of porting the existing Weston test suite to be run in Mir’s +test suite, but it is designed to be usable by any compositor. -wlcs relies on compositors providing an integration module, -providing wlcs with API hooks to start a compositor, connect a -client, move a window, and so on. +wlcs relies on compositors providing an integration module, providing wlcs with +API hooks to start a compositor, connect a client, move a window, and so on. -This makes both writing aid debugging tests easier - the tests -are (generally) in the same address space as the compositor, so -there is a consistent global clock available, it's easier to poke -around in compositor internals, and standard debugging tools can -follow control flow from the test client to the compositor and -back again. +This makes both writing and debugging tests easier - the tests are (generally) +in the same address space as the compositor, so there is a consistent global +clock available, it’s easier to poke around in compositor internals, and +standard debugging tools can follow control flow from the test client to the +compositor and back again. %package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Summary: Development files for wlcs +Requires: wlcs%{?_isa} = %{version}-%{release} %description devel -%{name} aspires to be a protocol-conformance-verifying test suite -usable by Wayland compositor implementors. +wlcs aspires to be a protocol-conformance-verifying test suite usable by +Wayland compositor implementors. -The %{name}-devel package contains libraries and header files for -developing Wayland compositor tests that use %{name}. +The wlcs-devel package contains libraries and header files for developing +Wayland compositor tests that use wlcs. %prep @@ -86,25 +143,45 @@ developing Wayland compositor tests that use %{name}. %build -%cmake -GNinja %{!?with_asan:-DWLCS_BUILD_ASAN=OFF} %{!?with_ubsan:-DWLCS_BUILD_UBSAN=OFF} %{!?with_tsan:-DWLCS_BUILD_TSAN=OFF} +%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 + %files %license COPYING.* %doc README.rst -%{_libexecdir}/%{name}/ + +%{_libexecdir}/wlcs/ + %files devel -%license COPYING.* %doc README.rst -%{_includedir}/%{name}/ -%{_libdir}/pkgconfig/%{name}.pc +%doc example + +%{_includedir}/wlcs/ +%{_libdir}/pkgconfig/wlcs.pc %changelog +* Tue Nov 02 2021 Benjamin A. Beasley - 1.3.0-4 +- Rebuild for gtest 1.11.0 (fix RHBZ#2001358) +- Remove obsolete macros and workarounds +- Update architecture lists for sanitizers +- Audit source licenses and correct License from “GPLv2 or GPLv3” to “GPLv3” +- Drop license files from -devel since it depends on the base package +- Reduce macro indirection in the spec file +- Use more pkgconfig(…) and cmake(…) dependencies where appropriate +- Package README.rst in -devel package only, and also package example/ +- Fix a trivial typo in README.rst and the package description + * Tue Nov 2 2021 Mamoru TASAKA - 1.3.0-3 - Backport upstream patch to build with gtest 1.11 From 4073d6955bb906e968b1437a54f5490421542231 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 2 Nov 2021 15:27:48 -0400 Subject: [PATCH 06/46] Opt in to rpmautospec --- changelog | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ wlcs.spec | 52 ++-------------------------------------------------- 2 files changed, 51 insertions(+), 50 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..c9b9216 --- /dev/null +++ b/changelog @@ -0,0 +1,49 @@ +* Tue Nov 02 2021 Benjamin A. Beasley - 1.3.0-4 +- Rebuild for gtest 1.11.0 (fix RHBZ#2001358) +- Remove obsolete macros and workarounds +- Update architecture lists for sanitizers +- Audit source licenses and correct License from “GPLv2 or GPLv3” to “GPLv3” +- Drop license files from -devel since it depends on the base package +- Reduce macro indirection in the spec file +- Use more pkgconfig(…) and cmake(…) dependencies where appropriate +- Package README.rst in -devel package only, and also package example/ +- Fix a trivial typo in README.rst and the package description + +* Tue Nov 2 2021 Mamoru TASAKA - 1.3.0-3 +- Backport upstream patch to build with gtest 1.11 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jun 24 2021 Neal Gompa - 1.3.0-1 +- Update to 1.3.0 (RH#1931861) + +* Wed Jan 27 2021 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sun Nov 1 2020 Neal Gompa - 1.2.0-1 +- Update to 1.2.0 (RH#1893144) + +* Sat Oct 17 2020 Jeff Law - 1.1.0-5 +- Use reference for loop variable to avoid range-loop-construct warning + +* Wed Jul 29 2020 Fedora Release Engineering - 1.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Apr 01 2020 Neal Gompa - 1.1.0-3 +- Rebuild for gtest 1.10.0 + +* Fri Jan 31 2020 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Aug 27 2019 Neal Gompa - 1.1.0-1 +- Update to 1.1.0 (RH#1742232) + +* Sat Jul 27 2019 Fedora Release Engineering - 1.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Jul 13 2019 Neal Gompa - 1.0.0-2 +- Fix pkgconfig file to point to runner binaries + +* Sat Jul 13 2019 Neal Gompa - 1.0.0-1 +- Initial packaging for Fedora diff --git a/wlcs.spec b/wlcs.spec index 802c55e..9b32f5a 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -26,7 +26,7 @@ Name: wlcs Version: 1.3.0 -Release: 4%{?dist} +Release: %autorelease Summary: Wayland Conformance Test Suite # The entire source is GPLv3, except: @@ -171,52 +171,4 @@ Wayland compositor tests that use wlcs. %changelog -* Tue Nov 02 2021 Benjamin A. Beasley - 1.3.0-4 -- Rebuild for gtest 1.11.0 (fix RHBZ#2001358) -- Remove obsolete macros and workarounds -- Update architecture lists for sanitizers -- Audit source licenses and correct License from “GPLv2 or GPLv3” to “GPLv3” -- Drop license files from -devel since it depends on the base package -- Reduce macro indirection in the spec file -- Use more pkgconfig(…) and cmake(…) dependencies where appropriate -- Package README.rst in -devel package only, and also package example/ -- Fix a trivial typo in README.rst and the package description - -* Tue Nov 2 2021 Mamoru TASAKA - 1.3.0-3 -- Backport upstream patch to build with gtest 1.11 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jun 24 2021 Neal Gompa - 1.3.0-1 -- Update to 1.3.0 (RH#1931861) - -* Wed Jan 27 2021 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sun Nov 1 2020 Neal Gompa - 1.2.0-1 -- Update to 1.2.0 (RH#1893144) - -* Sat Oct 17 2020 Jeff Law - 1.1.0-5 -- Use reference for loop variable to avoid range-loop-construct warning - -* Wed Jul 29 2020 Fedora Release Engineering - 1.1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Apr 01 2020 Neal Gompa - 1.1.0-3 -- Rebuild for gtest 1.10.0 - -* Fri Jan 31 2020 Fedora Release Engineering - 1.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Aug 27 2019 Neal Gompa - 1.1.0-1 -- Update to 1.1.0 (RH#1742232) - -* Sat Jul 27 2019 Fedora Release Engineering - 1.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Jul 13 2019 Neal Gompa - 1.0.0-2 -- Fix pkgconfig file to point to runner binaries - -* Sat Jul 13 2019 Neal Gompa - 1.0.0-1 -- Initial packaging for Fedora +%autochangelog From 439e14cc5384d5332b321e8893f54339b05d7e79 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 14 Jan 2022 13:26:15 -0500 Subject: [PATCH 07/46] Drop -Werror It makes sense for upstream CI, but is too strict for packaging. --- wlcs.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wlcs.spec b/wlcs.spec index 9b32f5a..04d12c5 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -140,6 +140,8 @@ Wayland compositor tests that use wlcs. %prep %autosetup -p1 +# -Werror makes sense for upstream CI, but is too strict for packaging +sed -r -i 's/-Werror //' CMakeLists.txt %build From d7b00d8493140df79655d0128e97a00fa6379150 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:33:33 +0000 Subject: [PATCH 08/46] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering From f499c432599c90bfd88b31342dcd42a32086801b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 19 Mar 2022 09:06:07 -0400 Subject: [PATCH 09/46] Update to 1.4.0 (close RHBZ#2065815) --- .gitignore | 1 + 215.patch | 26 ---------- ...93f7b7db154b7899f415ec67677e6ddd7ff5.patch | 49 ------------------- sources | 2 +- wlcs.spec | 23 +++------ 5 files changed, 9 insertions(+), 92 deletions(-) delete mode 100644 215.patch delete mode 100644 f6ff93f7b7db154b7899f415ec67677e6ddd7ff5.patch diff --git a/.gitignore b/.gitignore index f2ea7d9..09c567f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /wlcs-1.1.0.tar.xz /wlcs-1.2.0.tar.xz /wlcs-1.3.0.tar.xz +/wlcs-1.4.0.tar.xz diff --git a/215.patch b/215.patch deleted file mode 100644 index 6dfbf93..0000000 --- a/215.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6aa1becb3cee328f715af76d16de544974b6646e Mon Sep 17 00:00:00 2001 -From: "Benjamin A. Beasley" -Date: Tue, 2 Nov 2021 13:40:07 -0400 -Subject: [PATCH] =?UTF-8?q?Fix=20a=20trivial=20typo=20(=E2=80=9Caid?= - =?UTF-8?q?=E2=80=9D=20for=20=E2=80=9Cand=E2=80=9D)=20in=20README.rst?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - README.rst | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/README.rst b/README.rst -index 50f8ec1f..7656dc30 100644 ---- a/README.rst -+++ b/README.rst -@@ -25,7 +25,7 @@ happens-before ordering available. - - Instead, ``wlcs`` relies on compositors providing an integration module, - providing ``wlcs`` with API hooks to start a compositor, connect a client, --move a window, and so on. This makes both writing aid debugging tests easier - -+move a window, and so on. This makes both writing and debugging tests easier - - the tests are (generally) in the same address space as the compositor, so there - is a consistent global clock available, it's easier to poke around in - compositor internals, and standard debugging tools can follow control flow from diff --git a/f6ff93f7b7db154b7899f415ec67677e6ddd7ff5.patch b/f6ff93f7b7db154b7899f415ec67677e6ddd7ff5.patch deleted file mode 100644 index 31981c6..0000000 --- a/f6ff93f7b7db154b7899f415ec67677e6ddd7ff5.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f6ff93f7b7db154b7899f415ec67677e6ddd7ff5 Mon Sep 17 00:00:00 2001 -From: Victor Berger -Date: Thu, 8 Jul 2021 19:39:30 +0200 -Subject: [PATCH] Fix build when using GTest-1.11 - -Some change in GTest 1.11 headers caused a conflict on the name -`Pointer`. Removing the unconditional import of namespace `testing` -in favor of individual imports of the used items fixes it. - -cc #205 ---- - tests/pointer_constraints.cpp | 6 +++++- - tests/relative_pointer.cpp | 6 +++++- - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/tests/pointer_constraints.cpp b/tests/pointer_constraints.cpp -index d306710..6ee856f 100644 ---- a/tests/pointer_constraints.cpp -+++ b/tests/pointer_constraints.cpp -@@ -24,7 +24,11 @@ - - #include - --using namespace testing; -+using testing::AnyNumber; -+using testing::Eq; -+using testing::Ne; -+using testing::NotNull; -+ - using namespace wlcs; - - namespace -diff --git a/tests/relative_pointer.cpp b/tests/relative_pointer.cpp -index c33316c..c5c5358 100644 ---- a/tests/relative_pointer.cpp -+++ b/tests/relative_pointer.cpp -@@ -22,7 +22,11 @@ - - #include - --using namespace testing; -+using testing::AnyNumber; -+using testing::IsTrue; -+using testing::NotNull; -+using testing::_; -+ - using namespace wlcs; - - namespace diff --git a/sources b/sources index 483acbf..b90c256 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wlcs-1.3.0.tar.xz) = 3c4ffd9fa1a087fe58912792f0747884bc42bb344be07e937079d399d2bf85c0e9e445880d8e503bad0028c48ffbf2338174c3c74faee5057bf62ff7f121f0de +SHA512 (wlcs-1.4.0.tar.xz) = a6707f730b499cb1927ad9b3acbdb561e0788f201ffde472fafd7d427b8ee7195b9b0adc14b7c621c87afc0c13056e3ed69d53dd347178e302dc58b9bbb87b6e diff --git a/wlcs.spec b/wlcs.spec index 04d12c5..36a4934 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -1,5 +1,5 @@ # List copied from gcc.spec -# Current as of 11.2.1 (line 59) +# Current as of 12.0.1 (line 60) # 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 11.2.1 (line 74) +# Current as of 12.0.1 (line 75) # 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 11.2.1 (line 64) +# Current as of 12.0.1 (line 65) %ifarch x86_64 ppc64 ppc64le aarch64 %bcond_without tsan %else @@ -25,7 +25,7 @@ %endif Name: wlcs -Version: 1.3.0 +Version: 1.4.0 Release: %autorelease Summary: Wayland Conformance Test Suite @@ -60,6 +60,7 @@ Summary: Wayland Conformance Test Suite # - 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/xdg_popup_v6.cpp # - tests/xdg_surface_stable.cpp # - tests/xdg_surface_v6.cpp @@ -75,17 +76,6 @@ Summary: Wayland Conformance Test Suite License: GPLv3 URL: https://github.com/MirServer/wlcs Source0: %{url}/releases/download/v%{version}/wlcs-%{version}.tar.xz -# Backport upstream commit f6ff93f7b7db154b7899f415ec67677e6ddd7ff5: -# -# Fix build when using GTest-1.11 -# -# Some change in GTest 1.11 headers caused a conflict on the name -# `Pointer`. Removing the unconditional import of namespace `testing` -# in favor of individual imports of the used items fixes it. -Patch0: %{url}/commit/f6ff93f7b7db154b7899f415ec67677e6ddd7ff5.patch -# Fix a trivial typo (“aid” for “and”) in README.rst -# https://github.com/MirServer/wlcs/pull/215 -Patch1: %{url}/pull/215.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -126,6 +116,7 @@ clock available, it’s easier to poke around in compositor internals, and standard debugging tools can follow control flow from the test client to the compositor and back again. + %package devel Summary: Development files for wlcs Requires: wlcs%{?_isa} = %{version}-%{release} @@ -139,7 +130,7 @@ Wayland compositor tests that use wlcs. %prep -%autosetup -p1 +%autosetup # -Werror makes sense for upstream CI, but is too strict for packaging sed -r -i 's/-Werror //' CMakeLists.txt From 5351a75a8002fda0b5800ed8d8f7460af88b8127 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 28 Jun 2022 08:03:56 -0400 Subject: [PATCH 10/46] Rebuilt for gtest 1.12.0 (close RHBZ#2101750) From c0236a431301987900cd10cfd9b26710ad6f0085 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 10 Jul 2022 22:33:25 +0900 Subject: [PATCH 11/46] Rebuild against new gtest From 9d7406bf2f1573b736843b3369d50d60e9fb558f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:31:01 +0000 Subject: [PATCH 12/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From e70f2e16b25b9c86d00699417e17a040d7736ebb Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 29 Nov 2022 14:22:25 -0500 Subject: [PATCH 13/46] Update architecture list for libtsan --- wlcs.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wlcs.spec b/wlcs.spec index 36a4934..a79c030 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -1,5 +1,5 @@ # List copied from gcc.spec -# Current as of 12.0.1 (line 60) +# Current as of 12.2.1 (line 60) # 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.0.1 (line 75) +# Current as of 12.2.1 (line 75) # Note that this covers all Fedora primary architectures. %ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %bcond_without ubsan @@ -17,8 +17,8 @@ %endif # List copied from gcc.spec -# Current as of 12.0.1 (line 65) -%ifarch x86_64 ppc64 ppc64le aarch64 +# Current as of 12.2.1 (line 65) +%ifarch x86_64 ppc64 ppc64le aarch64 s390x %bcond_without tsan %else %bcond_with tsan From 79263c839b2414f0367d361e1329422cd6faf7e0 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 29 Nov 2022 14:27:57 -0500 Subject: [PATCH 14/46] Update License to SPDX --- wlcs.spec | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/wlcs.spec b/wlcs.spec index a79c030..447c935 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -29,21 +29,21 @@ Version: 1.4.0 Release: %autorelease Summary: Wayland Conformance Test Suite -# The entire source is GPLv3, except: +# The entire source is GPL-3.0-only, except: # -# (GPLv2 or GPLv3): +# (GPL-2.0-only OR GPL-3.0-only): # - CMakeLists.txt # > Build system file that does not contribute to the licenses of the binary # RPMs # -# (LGPLv2 or LGPLv3): +# (LGPL-2.0-only OR LGPL-3.0-only): # - include/mutex.h # - include/shared_library.h # - src/helpers.cpp # - src/shared_library.cpp # > Since (L)GPLv2-only code is not compatible with (L)GPLv3 or (L)GPLv3+ code, # and these sources are combined with GPLv3 code, the LGPLv3 option is used -# in this package. +# in this package. However, we encode both options in the SPDX expression. # # GPLv2+: # - debian/* @@ -70,10 +70,7 @@ 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. -# -# Thus, files under GPLv3 and (LGPLv2 or LGPLv3) licenses contribute to the -# installed binaries, and the effective license remains GPLv3. -License: GPLv3 +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 From a51e8d4600f9cc33a13b48ccabeb3ddfe4b2f3aa Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 22 Dec 2022 12:45:40 -0500 Subject: [PATCH 15/46] Indicate dirs. in files list with trailing slashes --- wlcs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wlcs.spec b/wlcs.spec index 447c935..112fbdc 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -154,7 +154,7 @@ sed -r -i 's/-Werror //' CMakeLists.txt %files devel %doc README.rst -%doc example +%doc example/ %{_includedir}/wlcs/ %{_libdir}/pkgconfig/wlcs.pc From b9379c4b9bbca9a15b0fad769b485bf8fa0d182f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 20 Jan 2023 13:10:47 -0500 Subject: [PATCH 16/46] 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 112fbdc..f06cb3f 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 e0c91575d50b5879cb855030e9542192697389d4 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 20 Jan 2023 13:16:32 -0500 Subject: [PATCH 17/46] 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 f06cb3f..8f23bf6 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 25dafba9925f56f5b83b3fa37cd2bfb3648fffb4 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 24 Jan 2023 10:11:14 -0500 Subject: [PATCH 18/46] Rebuilt for gtest 1.13.0 (close RHBZ#2164017) From f6d31a048899d0d6cf8767f17faef40efd385da6 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 29 May 2023 13:11:34 -0400 Subject: [PATCH 19/46] 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 400569d3100671d5360106cff0a56fa88ffe5ebd Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 18 Jun 2023 12:08:33 -0400 Subject: [PATCH 20/46] 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 a4df2622fa280a6c0eca72dc14866859af66472a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 19 Jul 2023 08:51:23 -0400 Subject: [PATCH 21/46] 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 c27c0e50bdfa614d548795ecea34283a09b56ede Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 17 Oct 2023 11:59:48 -0400 Subject: [PATCH 22/46] 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 c9d6fa3946942999f49048319eebb9e158f095b1 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 17 Oct 2023 12:33:13 -0400 Subject: [PATCH 23/46] 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 From 8885432e1d3b5e3d9c51784ae13e1cb6053e04a6 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 30 Oct 2023 18:07:52 -0400 Subject: [PATCH 24/46] Rebuild for gtest 1.14.0 From b99314c5918c6cca291003e6115b3580ad0fd618 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 20 Dec 2023 10:54:05 -0500 Subject: [PATCH 25/46] Update to 1.7.0 (close RHBZ#2254812) --- .gitignore | 1 + sources | 2 +- wlcs.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7e441d1..a6ba4d9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /wlcs-1.5.0.tar.gz /wlcs-1.6.0.tar.gz /wlcs-1.6.1.tar.gz +/wlcs-1.7.0.tar.gz diff --git a/sources b/sources index dbf128a..f483246 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wlcs-1.6.1.tar.gz) = 136bee6ac1d55e55cbeb65e20cc6e6b1912c5b050bef63d16a869dc90b6e287dddb21d8861f3847811aa804d1e5edbe1de0616ebef888fce335399e249f60bce +SHA512 (wlcs-1.7.0.tar.gz) = e45a93819ad37b2594e4bde6a784fda6f96e427fa9d125f606433b3ad9d816dfd2f7adacaf93238909de117e7af37779ad7d3ade8c0535ca81fdd629de026057 diff --git a/wlcs.spec b/wlcs.spec index 9288405..2650bee 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -18,7 +18,7 @@ %bcond tsan 0%{?arch_has_tsan:1} Name: wlcs -Version: 1.6.1 +Version: 1.7.0 Release: %autorelease Summary: Wayland Conformance Test Suite From fce43b7315ce41f0567a4645d72a5c22f8e9f955 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:56:22 +0000 Subject: [PATCH 26/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4ae221bf8ec5281e64da2d759d9b152f22579b7a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 5 Apr 2024 10:26:38 -0400 Subject: [PATCH 27/46] Add an rpmlintrc file [skip changelog] --- wlcs.rpmlintrc | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 wlcs.rpmlintrc diff --git a/wlcs.rpmlintrc b/wlcs.rpmlintrc new file mode 100644 index 0000000..499c66f --- /dev/null +++ b/wlcs.rpmlintrc @@ -0,0 +1,2 @@ +# Not a real spelling error: +addFilter(r" spelling-error \('(implementors?)',") From bad98f764e9c6439658cca31d31073fdab3bc1bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:25:39 +0000 Subject: [PATCH 28/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 04eccb325e8da908e0f3289e0836473e8e35ca8b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 3 Nov 2024 07:11:11 -0500 Subject: [PATCH 29/46] Invoke %cmake in %conf rather than in %build --- wlcs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wlcs.spec b/wlcs.spec index 2650bee..91e41ba 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -135,12 +135,15 @@ Wayland compositor tests that use wlcs. sed -r -i 's/-Werror //' CMakeLists.txt -%build +%conf %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 + + +%build %cmake_build From 9177e6635357c866a014cabd9c5f34d10ae8be6f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 15 Dec 2024 11:33:21 -0500 Subject: [PATCH 30/46] Add a SourceLicense field --- wlcs.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/wlcs.spec b/wlcs.spec index 91e41ba..649f682 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -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. # -# GPLv2+: +# GPL-2.0-or-later # - debian/* # > Not used in this package # @@ -74,6 +74,13 @@ Summary: Wayland Conformance Test Suite # 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) +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 + } URL: https://github.com/MirServer/wlcs Source: %{url}/archive/v%{version}/wlcs-%{version}.tar.gz From 0811c7d5b063eb6e1bc8ef089e8ac1784ef8cb8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:07:06 +0000 Subject: [PATCH 31/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 24fc598db3295a3cb9ef60142746997b49a93932 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 22 Jan 2025 14:29:03 -0500 Subject: [PATCH 32/46] Rebuilt for gtest 1.15.2 From c93d6ccbd40455201fd07c2f9d22af711b139d65 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 5 Mar 2025 10:52:18 -0500 Subject: [PATCH 33/46] Update architectures for asan/tsan/ubsan tests based on GCC 15 - Adds riscv64 to supported architectures for all three kinds of tsts --- wlcs.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wlcs.spec b/wlcs.spec index 649f682..0a6fccd 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -1,14 +1,14 @@ # Lists copied from gcc.spec -# Current as of 13.2.1 (lines 66, 86, and 76, respectively). +# Current as of 15.0.1 (lines 68, 88, and 78, 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 +%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 riscv64 %global arch_has_asan 1 %endif -%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 +%ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 riscv64 %global arch_has_ubsan 1 %endif -%ifarch x86_64 ppc64 ppc64le aarch64 s390x +%ifarch x86_64 ppc64 ppc64le aarch64 s390x riscv64 %global arch_has_tsan 1 %endif From 7454946d254003a3a78b75f140be5fbd5be81c43 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 11 May 2025 08:56:14 -0400 Subject: [PATCH 34/46] Update .rpmlintrc file for current rpmlint --- wlcs.rpmlintrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wlcs.rpmlintrc b/wlcs.rpmlintrc index 499c66f..99ea686 100644 --- a/wlcs.rpmlintrc +++ b/wlcs.rpmlintrc @@ -1,2 +1,6 @@ # 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 ") From 77c37873ce26aa945ab94f0ba2a713366fe91931 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:28:15 +0000 Subject: [PATCH 35/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From e4174d1dd43cf3e04404e5d415ea1c9271358b31 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 15 Aug 2025 07:19:57 -0400 Subject: [PATCH 36/46] Update to 1.8.1 (close RHBZ#2388540) --- .gitignore | 1 + sources | 2 +- wlcs.spec | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a6ba4d9..86df98c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /wlcs-1.6.0.tar.gz /wlcs-1.6.1.tar.gz /wlcs-1.7.0.tar.gz +/wlcs-1.8.1.tar.gz diff --git a/sources b/sources index f483246..cb94fbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wlcs-1.7.0.tar.gz) = e45a93819ad37b2594e4bde6a784fda6f96e427fa9d125f606433b3ad9d816dfd2f7adacaf93238909de117e7af37779ad7d3ade8c0535ca81fdd629de026057 +SHA512 (wlcs-1.8.1.tar.gz) = 5a76c9a5b88ab0627300bd9a3cb63ceaf68824a15b79a605aa5fd3a9b12e2877489a7150a21da68bda21434bd947e4f0d1ecc8b6d81ab9a1faf84ee75e6d1ca2 diff --git a/wlcs.spec b/wlcs.spec index 0a6fccd..221504a 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -1,5 +1,5 @@ # Lists copied from gcc.spec -# Current as of 15.0.1 (lines 68, 88, and 78, respectively). +# Current as of 15.2.1 (lines 74, 94, and 84, 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 @@ -18,7 +18,7 @@ %bcond tsan 0%{?arch_has_tsan:1} Name: wlcs -Version: 1.7.0 +Version: 1.8.1 Release: %autorelease Summary: Wayland Conformance Test Suite @@ -138,15 +138,16 @@ 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 %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 From f4db9d37b4c1d73441ed6043ca1b28ead75440a4 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 12 Nov 2025 10:10:14 +0000 Subject: [PATCH 37/46] Rebuilt for gtest 1.17.0 From 0a8d322dd20e5b33eb4120d762278514dc664a4e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 11 Jan 2026 00:03:14 +0000 Subject: [PATCH 38/46] Update .rpmlintrc file [skip changelog] --- wlcs.rpmlintrc | 4 ---- 1 file changed, 4 deletions(-) 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 ") From 23dad957163424c36b2e29f6cbd986706f768b0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:17:27 +0000 Subject: [PATCH 39/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 598e1508f6355da5d80cd909835f67701ddc0207 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 15 Mar 2026 11:27:42 +0000 Subject: [PATCH 40/46] Verify asan/tsan/ubsan arch list for GCC 16.0.1 --- wlcs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wlcs.spec b/wlcs.spec index 221504a..4d4647f 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 From 1d8a76b37535a80f1b8b96b4dd80c0649d73a16a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 15 Mar 2026 11:24:55 +0000 Subject: [PATCH 41/46] =?UTF-8?q?The=20ninja=20backend=20is=20the=20defaul?= =?UTF-8?q?t=20now;=20don=E2=80=99t=20bother=20specifying=20it?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://fedoraproject.org/wiki/Changes/CMake_ninja_default --- wlcs.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/wlcs.spec b/wlcs.spec index 4d4647f..0897c23 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -84,12 +84,10 @@ SourceLicense: %{shrink: URL: https://github.com/MirServer/wlcs Source: %{url}/archive/v%{version}/wlcs-%{version}.tar.gz +BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: cmake -BuildRequires: ninja-build - BuildRequires: boost-devel BuildRequires: cmake(GTest) BuildRequires: gmock-devel @@ -147,8 +145,7 @@ Wayland compositor tests that use wlcs. -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 + -DWLCS_FATAL_COMPILE_WARNINGS:BOOL=OFF %build From 69ed6fc33d305ec862b9fd84811af429eb27689c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 20 May 2026 07:49:40 +0100 Subject: [PATCH 42/46] Trivial spec-file typo fix [skip changelog] --- wlcs.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wlcs.spec b/wlcs.spec index 0897c23..8523ef4 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -75,12 +75,12 @@ Summary: Wayland Conformance Test Suite # RPMs. License: GPL-3.0-only AND (LGPL-2.0-only OR LGPL-3.0-only) 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 AND + MIT + } URL: https://github.com/MirServer/wlcs Source: %{url}/archive/v%{version}/wlcs-%{version}.tar.gz From a3cc806bcee868ed53f7154aa0e6e7ad4396d401 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 20 May 2026 07:52:59 +0100 Subject: [PATCH 43/46] 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 44/46] 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 45/46] 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 8d3af92bb180ed113ff986e27ab7b6e6d57d749b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:51:29 +0000 Subject: [PATCH 46/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild