Update to 1.1.0 (RH#1742232)

.gitignore

@@ -1 +1,2 @@
 /wlcs-1.0.0.tar.xz
+/wlcs-1.1.0.tar.xz

0001-Fix-project-version-in-CMake-134.patch

@@ -0,0 +1,25 @@
+From e1bf260b052178fd27feef49bccfe05714b41590 Mon Sep 17 00:00:00 2001
+From: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
+Date: Wed, 21 Aug 2019 21:32:17 +1000
+Subject: [PATCH] Fix project version in CMake (#134)
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5fd1d4d..b421139 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,7 +21,7 @@ cmake_minimum_required(VERSION 3.5)
+ cmake_policy(SET CMP0015 NEW)
+ cmake_policy(SET CMP0022 NEW)
+ 
+-project(wlcs VERSION 1.0.0)
++project(wlcs VERSION 1.1.0)
+ 
+ add_definitions(-D_GNU_SOURCE)
+ add_definitions(-D_FILE_OFFSET_BITS=64)
+-- 
+2.21.0
+

0001-cmake-Install-wlcs-runners-in-libexecdir-rather-than.patch

@@ -1,33 +0,0 @@
-From 20515298c66595629703e628424cca0c81eb72e0 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <ngompa13@gmail.com>
-Date: Sat, 13 Jul 2019 08:17:53 -0400
-Subject: [PATCH] cmake: Install wlcs runners in libexecdir rather than libdir
-
-As these are executables instead of libraries, these should be
-installed into the libexecdir as defined by the distribution.
-
-For example, in Fedora, this means they are installed to /usr/libexec/wlcs.
-
-In Debian/Ubuntu, it would be /usr/lib/wlcs.
-
-Signed-off-by: Neal Gompa <ngompa13@gmail.com>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9e1c0d0..fe1255e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -218,7 +218,7 @@ endforeach(TARGET)
- 
- install(
-   TARGETS ${EXECUTABLE_TARGETS}
--  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/wlcs
-+  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/wlcs
- )
- 
- install(
--- 
-2.21.0
-

0001-pkgconfig-Actually-point-to-the-correct-runner-binar.patch

@@ -1,32 +0,0 @@
-From 48479c759b933bb75ed2b0dc2e1b85719921cf52 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <ngompa13@gmail.com>
-Date: Sat, 13 Jul 2019 20:01:32 -0400
-Subject: [PATCH] pkgconfig: Actually point to the correct runner binary
-
-In 20515298c66595629703e628424cca0c81eb72e0, the install path
-was changed, but the pkgconfig file wasn't fixed alongside it.
-
-Signed-off-by: Neal Gompa <ngompa13@gmail.com>
----
- wlcs.pc.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/wlcs.pc.in b/wlcs.pc.in
-index e34e7bd..baaebe1 100644
---- a/wlcs.pc.in
-+++ b/wlcs.pc.in
-@@ -1,9 +1,9 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}/@CMAKE_INSTALL_BINDIR@
--libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+libexecdir=${prefix}/@CMAKE_INSTALL_LIBEXECDIR@
- includedir=${prefix}/include
- 
--test_runner=${libdir}/wlcs/wlcs
-+test_runner=${libexecdir}/wlcs/wlcs
- 
- Name: wlcs
- Description: Wayland Conformance Suite test harness
--- 
-2.21.0
-

sources

@@ -1 +1 @@
-SHA512 (wlcs-1.0.0.tar.xz) = a514a9d16252d498407541fee1e52b9163d843815f33b2496982f3e67d771c2c18bfeebb6a45ee9c9f3a78adc56c1aac766f6ab82bd9be1c8eb254edf01fdc45
+SHA512 (wlcs-1.1.0.tar.xz) = ce9e47cf6b6ad5c34bf82af128a453a278e40646aa02efe1acdf037bfc34ce0342f588014dfaaa6ab3823c5daaa5c5b9d3e49d401f7784ae4fe4e61efadb767b

wlcs.spec

@@ -17,25 +17,21 @@
 %endif
 
 Name:           wlcs
-Version:        1.0.0
-Release:        3%{?dist}
+Version:        1.1.0
+Release:        1%{?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
 
-# Install wlcs binaries in the right place
-# From: https://github.com/MirServer/wlcs/pull/114
-Patch0001:      0001-cmake-Install-wlcs-runners-in-libexecdir-rather-than.patch
-# Fix pkgconfig file to point to correct location for wlcs binaries
-# From: https://github.com/MirServer/wlcs/pull/115
-Patch0002:      0001-pkgconfig-Actually-point-to-the-correct-runner-binar.patch
+# Backports from upstream
+Patch0001:      0001-Fix-project-version-in-CMake-134.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  cmake
-BuildRequires:  make
+BuildRequires:  ninja-build
 BuildRequires:  boost-devel
 BuildRequires:  gtest-devel
 BuildRequires:  gmock-devel
@@ -86,16 +82,20 @@ developing Wayland compositor tests that use %{name}.
 
 
 %prep
-%autosetup -p1
+# Version wasn't bumped before releasing...
+%autosetup -n %{name}-1.0.0 -p1
 
 
 %build
-%cmake %{!?with_asan:-DWLCS_BUILD_ASAN=OFF} %{!?with_ubsan:-DWLCS_BUILD_UBSAN=OFF} %{!?with_tsan:-DWLCS_BUILD_TSAN=OFF}
-%make_build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%cmake .. -GNinja %{!?with_asan:-DWLCS_BUILD_ASAN=OFF} %{!?with_ubsan:-DWLCS_BUILD_UBSAN=OFF} %{!?with_tsan:-DWLCS_BUILD_TSAN=OFF}
+popd
+%ninja_build -C %{_target_platform}
 
 
 %install
-%make_install
+%ninja_install -C %{_target_platform}
 
 %files
 %license COPYING.*
@@ -110,6 +110,9 @@ developing Wayland compositor tests that use %{name}.
 
 
 %changelog
+* Tue Aug 27 2019 Neal Gompa <ngompa13@gmail.com> - 1.1.0-1
+- Update to 1.1.0 (RH#1742232)
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild