From 8d275b149a6793e6fbf5cf943345255a1f6f276c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 29 Nov 2022 14:22:25 -0500 Subject: [PATCH 1/4] 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 d64008ac0bb7bc58a11d4c2a950e55d0a335614b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 29 Nov 2022 14:27:57 -0500 Subject: [PATCH 2/4] 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 d04b8266fbe3573b622fd2f225a1a892eacd2782 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 22 Dec 2022 12:45:40 -0500 Subject: [PATCH 3/4] 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 7c2b92285e96ce40a7c4822178c9a8596d274905 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 20 Jan 2023 13:16:32 -0500 Subject: [PATCH 4/4] 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