From bfd181c1cbaff46e6a183d196ae802620c4394cc Mon Sep 17 00:00:00 2001 From: Onuralp SEZER Date: Tue, 15 Feb 2022 08:32:41 +0300 Subject: [PATCH] - Version 2.2.0 - Upstream patch removed - Fix: https://github.com/maliit/framework/issues/86 Signed-off-by: Onuralp SEZER --- ...k-properly-search-for-qtwaylandscanner.patch | 14 -------------- maliit-framework.spec | 17 ++++++++++------- sources | 1 + 3 files changed, 11 insertions(+), 21 deletions(-) delete mode 100644 maliit-framework-properly-search-for-qtwaylandscanner.patch diff --git a/maliit-framework-properly-search-for-qtwaylandscanner.patch b/maliit-framework-properly-search-for-qtwaylandscanner.patch deleted file mode 100644 index 4f08b2f..0000000 --- a/maliit-framework-properly-search-for-qtwaylandscanner.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/cmake/FindQtWaylandScanner.cmake b/cmake/FindQtWaylandScanner.cmake -index 3143d01..f38ee7f 100644 ---- a/cmake/FindQtWaylandScanner.cmake -+++ b/cmake/FindQtWaylandScanner.cmake -@@ -69,7 +69,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpers.cmake) - ecm_find_package_version_check(QtWaylandScanner) - - # Find qtwaylandscanner --find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS /usr/lib64/qt5/bin/) -+find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner -+ HINTS /usr/lib64/qt5/bin/ /usr/lib/qt5/bin/) - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(QtWaylandScanner diff --git a/maliit-framework.spec b/maliit-framework.spec index 0ff38f7..876114c 100644 --- a/maliit-framework.spec +++ b/maliit-framework.spec @@ -1,14 +1,11 @@ Name: maliit-framework -Version: 2.0.0 -Release: 5%{?dist} +Version: 2.2.0 +Release: 1%{?dist} Summary: Input method framework License: LGPLv2 URL: https://maliit.github.io/ -Source0: https://github.com/maliit/framework/archive/refs/tags/framework-%{version}.tar.gz - -# Upstream PR: https://github.com/maliit/framework/pull/57 -Patch0: maliit-framework-properly-search-for-qtwaylandscanner.patch +Source0: https://github.com/maliit/framework/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: gcc-c++ @@ -105,7 +102,7 @@ This package contains tests and examples for %{name}. %files %license LICENSE.LGPL -%doc README NEWS +%doc README.md NEWS %{_bindir}/maliit-server %{_libdir}/libmaliit-glib.so.2* %{_datadir}/dbus-1/services/org.maliit.server.service @@ -138,6 +135,12 @@ This package contains tests and examples for %{name}. %changelog +* Tue Feb 15 2022 Onuralp Sezer - 2.2.0-1 +- Version 2.2.0 +- Upstream patch removed +- Fix: https://github.com/maliit/framework/issues/86 + + * Thu Jan 20 2022 Fedora Release Engineering - 2.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 8f40459..a5ef638 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (framework-2.0.0.tar.gz) = 640ae6aee25723ba22ec524b6598ea94bd34ca83be2314b74cd3dff9cddf95f34a62ffc58588782de4d2d2c6f1a09f9e388d56adf8d32752678d6895eb37db17 +SHA512 (maliit-framework-2.2.0.tar.gz) = c44aa605f17d2ccb9451a84969009857033e69caad776a6d5c5b28ce767b2709139f1d95bf00bda09f9787e9c0b9d766c7d1fb32b1f054d10261b06623687613