From 025ee923bf9a63fc115ab3b3920072dad2c345d5 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 22 Mar 2022 08:39:13 +0100 Subject: [PATCH 1/4] Rebuild (qt5) --- kf5-kwayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kwayland.spec b/kf5-kwayland.spec index 14519c3..09c17b7 100644 --- a/kf5-kwayland.spec +++ b/kf5-kwayland.spec @@ -14,7 +14,7 @@ Name: kf5-%{framework} Version: 5.91.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 library that wraps Client and Server Wayland libraries License: GPLv2+ @@ -112,6 +112,9 @@ make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||: %changelog +* Tue Mar 22 2022 Jan Grulich - 5.91.0-2 +- Rebuild (qt5) + * Fri Feb 11 2022 Rex Dieter - 5.91.0-1 - 5.91.0 From f1e8e429aa4dffae92c1bae6679ad1a6c22ecdbf Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Mon, 11 Apr 2022 15:51:21 +0930 Subject: [PATCH 2/4] Update to 5.93.0 --- .gitignore | 1 + kf5-kwayland.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3ac554e..b9f9e85 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ /kwayland-5.89.0.tar.xz /kwayland-5.90.0.tar.xz /kwayland-5.91.0.tar.xz +/kwayland-5.93.0.tar.xz diff --git a/kf5-kwayland.spec b/kf5-kwayland.spec index 09c17b7..90037fa 100644 --- a/kf5-kwayland.spec +++ b/kf5-kwayland.spec @@ -13,8 +13,8 @@ %endif Name: kf5-%{framework} -Version: 5.91.0 -Release: 2%{?dist} +Version: 5.93.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 library that wraps Client and Server Wayland libraries License: GPLv2+ @@ -112,6 +112,9 @@ make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||: %changelog +* Mon Apr 11 2022 Justin Zobel - 5.93.0-1 +- Update to 5.93.0 + * Tue Mar 22 2022 Jan Grulich - 5.91.0-2 - Rebuild (qt5) diff --git a/sources b/sources index 2894ac9..bec19bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kwayland-5.91.0.tar.xz) = 3e0b111987aec51e4217d0a75d30888506a9c9ab21902ac7626d210ef3b6314f7c3ca78d38d1c54c1e674033d180ae70753cb34e2be2570efd946a841a40848f +SHA512 (kwayland-5.93.0.tar.xz) = 26157575ee49916ff1e75fccccfbd192536dbb1f914432c6e784d52eb95343c61caf26b5d3e5e6ddf1f7f439494debadbd29263631cb9489e12b98b1b9eb30c4 From 73d4266050e5543e8133e2f273feaf7a9157d9eb Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Thu, 16 Jun 2022 14:36:44 +0930 Subject: [PATCH 3/4] Remove merge conflict header --- kf5-kwayland.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/kf5-kwayland.spec b/kf5-kwayland.spec index 28dc182..4ff6bc3 100644 --- a/kf5-kwayland.spec +++ b/kf5-kwayland.spec @@ -112,7 +112,6 @@ make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||: %changelog -<<<<<<< HEAD * Mon Apr 11 2022 Justin Zobel - 5.93.0-1 - Update to 5.93.0 From 103d08164cd4662554658aff43f5ac02a5565a34 Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Sat, 13 Aug 2022 13:54:18 +0930 Subject: [PATCH 4/4] %global variable fix --- kf5-kwayland.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kf5-kwayland.spec b/kf5-kwayland.spec index 63457a0..b6bd273 100644 --- a/kf5-kwayland.spec +++ b/kf5-kwayland.spec @@ -1,6 +1,6 @@ -%global framework kwayland +%global framework kwayland -%global wayland_min_version 1.3 +%global wayland_min_version 1.3 ## uncomment to enable bootstrap mode #global bootstrap 1