From 11389b76dc3563ed5ad1965cf0fdf8cb035c1739 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Wed, 5 Oct 2022 12:06:28 +0200 Subject: [PATCH 1/3] Update to 0.2.10 --- .gitignore | 5 +++++ sources | 4 ++++ waylandpp.spec | 7 +++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 78ef8c1..dfeb95b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,8 @@ /waylandpp-0.2.5.tar.gz /waylandpp-0.2.7.tar.gz /waylandpp-0.2.8.tar.gz +<<<<<<< HEAD +======= +/waylandpp-0.2.9.tar.gz +/waylandpp-0.2.10.tar.gz +>>>>>>> a0611b0 (Update to 0.2.10) diff --git a/sources b/sources index 1af979b..c35371d 100644 --- a/sources +++ b/sources @@ -1 +1,5 @@ +<<<<<<< HEAD SHA512 (waylandpp-0.2.8.tar.gz) = bf1b8a9e69b87547fc65989b9eaff88a442d8b2f01f5446cef960000b093390b1e557536837fbf38bb6d9a4f93e3985ea34c3253f94925b0f571b4606c980832 +======= +SHA512 (waylandpp-0.2.10.tar.gz) = 02f0844e4003435d0e9edc4664b2843616aaeb46bd908b2301dc97945f285a57e62fba0d8693ce7a009bbb422aa23bf5261521a545f482e9f8c588e095340c99 +>>>>>>> a0611b0 (Update to 0.2.10) diff --git a/waylandpp.spec b/waylandpp.spec index 6ce0937..62fde54 100644 --- a/waylandpp.spec +++ b/waylandpp.spec @@ -1,6 +1,6 @@ Name: waylandpp -Version: 0.2.8 -Release: 7%{?dist} +Version: 0.2.10 +Release: 1%{?dist} Summary: Wayland C++ bindings # waylandpp includes part of Wayland under MIT, wayland-scanner++ is GPLv3+ @@ -90,6 +90,9 @@ rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc/latex/ %changelog +* Wed Oct 05 2022 Mohamed El Morabity - 0.2.10-1 +- Update to 0.2.10 + * Thu Jul 29 2021 Mohamed El Morabity - 0.2.8-7 - Fix FTBFS (RHBZ #1988041) From a62a2691ed497c4d1030c7d6ef6c369da4db72ba Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Wed, 5 Oct 2022 12:06:28 +0200 Subject: [PATCH 2/3] Typo --- .gitignore | 3 +++ sources | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index dfeb95b..35538f0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,7 @@ ======= /waylandpp-0.2.9.tar.gz /waylandpp-0.2.10.tar.gz +<<<<<<< HEAD +>>>>>>> a0611b0 (Update to 0.2.10) +======= >>>>>>> a0611b0 (Update to 0.2.10) diff --git a/sources b/sources index c35371d..d0e6d70 100644 --- a/sources +++ b/sources @@ -1,5 +1,9 @@ <<<<<<< HEAD +<<<<<<< HEAD SHA512 (waylandpp-0.2.8.tar.gz) = bf1b8a9e69b87547fc65989b9eaff88a442d8b2f01f5446cef960000b093390b1e557536837fbf38bb6d9a4f93e3985ea34c3253f94925b0f571b4606c980832 ======= SHA512 (waylandpp-0.2.10.tar.gz) = 02f0844e4003435d0e9edc4664b2843616aaeb46bd908b2301dc97945f285a57e62fba0d8693ce7a009bbb422aa23bf5261521a545f482e9f8c588e095340c99 >>>>>>> a0611b0 (Update to 0.2.10) +======= +SHA512 (waylandpp-0.2.10.tar.gz) = 02f0844e4003435d0e9edc4664b2843616aaeb46bd908b2301dc97945f285a57e62fba0d8693ce7a009bbb422aa23bf5261521a545f482e9f8c588e095340c99 +>>>>>>> a0611b0 (Update to 0.2.10) From 10bf7ffaf0004b670c17fb7b78b750c712570c2e Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Wed, 5 Oct 2022 12:18:12 +0200 Subject: [PATCH 3/3] Typo --- sources | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sources b/sources index d0e6d70..3fdf5ac 100644 --- a/sources +++ b/sources @@ -1,9 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -SHA512 (waylandpp-0.2.8.tar.gz) = bf1b8a9e69b87547fc65989b9eaff88a442d8b2f01f5446cef960000b093390b1e557536837fbf38bb6d9a4f93e3985ea34c3253f94925b0f571b4606c980832 -======= SHA512 (waylandpp-0.2.10.tar.gz) = 02f0844e4003435d0e9edc4664b2843616aaeb46bd908b2301dc97945f285a57e62fba0d8693ce7a009bbb422aa23bf5261521a545f482e9f8c588e095340c99 ->>>>>>> a0611b0 (Update to 0.2.10) -======= -SHA512 (waylandpp-0.2.10.tar.gz) = 02f0844e4003435d0e9edc4664b2843616aaeb46bd908b2301dc97945f285a57e62fba0d8693ce7a009bbb422aa23bf5261521a545f482e9f8c588e095340c99 ->>>>>>> a0611b0 (Update to 0.2.10)