From 4f04a9faacbaa35be4da8c5370d2dcf9763b17b5 Mon Sep 17 00:00:00 2001 From: Qiyu Yan Date: Wed, 13 Jan 2021 11:27:28 +0800 Subject: [PATCH] update to 5.0.2 upstream release --- .gitignore | 2 ++ 0001-use-usr-libexec-instead.patch | 22 ---------------------- fcitx5-qt.spec | 11 ++++++----- sources | 4 ++-- 4 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 0001-use-usr-libexec-instead.patch diff --git a/.gitignore b/.gitignore index a1ee8e2..0e37c28 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ *.rpm /fcitx5-qt-5.0.1.tar.xz /fcitx5-qt-5.0.1.tar.xz.sig +/fcitx5-qt-5.0.2.tar.xz +/fcitx5-qt-5.0.2.tar.xz.sig diff --git a/0001-use-usr-libexec-instead.patch b/0001-use-usr-libexec-instead.patch deleted file mode 100644 index fee1cb5..0000000 --- a/0001-use-usr-libexec-instead.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e87aea0f57b2a728b2605ce177f45aebb5fc7792 Mon Sep 17 00:00:00 2001 -From: Qiyu Yan -Date: Wed, 12 Aug 2020 15:07:13 +0800 -Subject: [PATCH] use /usr/libexec instead - ---- - qt5/guiwrapper/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qt5/guiwrapper/CMakeLists.txt b/qt5/guiwrapper/CMakeLists.txt -index a5baafc..661e38f 100644 ---- a/qt5/guiwrapper/CMakeLists.txt -+++ b/qt5/guiwrapper/CMakeLists.txt -@@ -18,4 +18,4 @@ target_link_libraries(fcitx5-qt5-gui-wrapper - Fcitx5Qt5::WidgetsAddons - ) - --install(TARGETS fcitx5-qt5-gui-wrapper DESTINATION "${CMAKE_INSTALL_LIBDIR}/fcitx5/libexec") -+install(TARGETS fcitx5-qt5-gui-wrapper DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/fcitx5") --- -2.26.2 - diff --git a/fcitx5-qt.spec b/fcitx5-qt.spec index 7193ff4..a171567 100644 --- a/fcitx5-qt.spec +++ b/fcitx5-qt.spec @@ -1,8 +1,8 @@ %global __provides_exclude_from ^%{_libdir}/(fcitx5|qt5)/.*\\.so$ Name: fcitx5-qt -Version: 5.0.1 -Release: 2%{?dist} +Version: 5.0.2 +Release: 1%{?dist} Summary: Qt library and IM module for fcitx5 # Fcitx5Qt{4,5}DBusAddons Library and Input context plugin are released under BSD. License: LGPLv2+ and BSD @@ -10,8 +10,6 @@ URL: https://github.com/fcitx/fcitx5-qt Source: https://download.fcitx-im.org/fcitx5/%{name}/%{name}-%{version}.tar.xz Source1: https://download.fcitx-im.org/fcitx5/%{name}/%{name}-%{version}.tar.xz.sig Source2: https://pgp.key-server.io/download/0x8E8B898CBF2412F9 -# upstream don't use /usr/libexec, patch to fix -Patch0: 0001-use-usr-libexec-instead.patch BuildRequires: gnupg2 BuildRequires: cmake @@ -80,7 +78,7 @@ Development files for %{name} %files -f %{name}.lang %license LICENSES/LGPL-2.1-or-later.txt %doc README.md -%{_libexecdir}/fcitx5/ +%{_libexecdir}/fcitx5-qt5-gui-wrapper %{_libdir}/fcitx5/qt5/ %files devel @@ -103,6 +101,9 @@ Development files for %{name} %{_libdir}/libFcitx5Qt5DBusAddons.so.*.* %changelog +* Wed Jan 13 10:50:52 CST 2021 Qiyu Yan - 5.0.2-1 +- update to 5.0.2 upstream release + * Sun Dec 6 00:42:46 CST 2020 Qiyu Yan - 5.0.1-2 - split package - libfcitx5qtdbus and libfcitx5qt5widgets diff --git a/sources b/sources index 67bc160..446b9c1 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (fcitx5-qt-5.0.1.tar.xz) = ed6f91b3273f79768a2961e2b2556d85c289a7eb11d6494bee71effa448c5acc9ecc92d7dcaad111b18a5e899a37b97ae1479dcf250bf78ce82514b17592afd7 -SHA512 (fcitx5-qt-5.0.1.tar.xz.sig) = b9a2395f921fa742ecbe4d3dac5b77943abeb6c7c5bd7de2801fc809f9d7d2779e6f2675779c5e50ec1a6cd68c725736807ef40624789c2d2d284f10282e07e7 +SHA512 (fcitx5-qt-5.0.2.tar.xz) = 7fc5be56987fe37fd2141e6026c5db55180e4c4dcd394943e702649839cb0c87434d7d4a33c6c925eea24f2837329c816f996e4b72395a74db3f944aeb246936 +SHA512 (fcitx5-qt-5.0.2.tar.xz.sig) = e74d32ff375970f762b17b2188f81572a6df8afa4067c6e165fc850eca4cbd94c4d5110e7686db24693bdc56e9ad23ea77fab83887de3c28e59bcb3e7d54b3db SHA512 (0x8E8B898CBF2412F9) = e8127bfd351fe8867db7fc3a4dc6187bd9694cefa50588afe2327bed7d7d2b300993f442ff6029f15fae289bdac7cc22501ec03fc83cbe760ce3bf86c6512279