Merge branch 'master' into epel7

- Rely on extra-cmake-modules to pull in a proper version of cmake

.gitignore

@@ -8,5 +8,3 @@
 /fcitx-qt5-1.2.2.tar.xz
 /fcitx-qt5-1.2.3.tar.xz
 /fcitx-qt5-1.2.4.tar.xz
-/fcitx-qt5-1.2.5.tar.xz
-/fcitx-qt5-1.2.6.tar.xz

fcitx-qt5.spec

@@ -1,17 +1,15 @@
 %global project_name FcitxQt5
 
 Name:           fcitx-qt5
-Version:        1.2.6
-Release:        20%{?dist}
+Version:        1.2.4
+Release:        1%{?dist}
 Summary:        Fcitx IM module for Qt5
 
 # The entire source code is GPLv2+ except
 # platforminputcontext/ which is BSD
 License:        GPLv2+ and BSD
 URL:            https://github.com/fcitx/fcitx-qt5
-Source0:        https://download.fcitx-im.org/%{name}/%{name}-%{version}.tar.xz
-
-BuildRequires:  cmake
+Source0:        http://download.fcitx-im.org/%{name}/%{name}-%{version}.tar.xz
 BuildRequires:  fcitx-devel
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  libxkbcommon-devel
@@ -32,7 +30,7 @@ This package provides Fcitx Qt5 input context.
 %package devel
 Summary:        Development files for fcitx-qt5
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       cmake
+
 
 %description devel
 The %{name}-devel package contains libraries and header files necessary for
@@ -42,11 +40,18 @@ developing programs using fcitx-qt5 libraries.
 %setup -q
 
 %build
-%cmake
-%cmake_build
+mkdir -pv build
+pushd build
+%if "%{?__cmake3}" != ""
+%cmake3 ..
+%else
+%cmake ..
+%endif
+popd
+make %{?_smp_mflags} -C build
 
 %install
-%cmake_install
+make install/fast DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -C build
 %find_lang %{name}
 
 %ldconfig_scriptlets
@@ -66,98 +71,6 @@ developing programs using fcitx-qt5 libraries.
 
 
 %changelog
-* Fri Mar 15 2024 Jan Grulich <jgrulich@redhat.com> - 1.2.6-20
-- Rebuild (qt5)
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jan 03 2024 Jan Grulich <jgrulich@redhat.com> - 1.2.6-17
-- Rebuild (qt5)
-
-* Mon Oct 09 2023 Jan Grulich <jgrulich@redhat.com> - 1.2.6-16
-- Rebuild (qt5)
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jun 14 2023 Jan Grulich <jgrulich@redhat.com> - 1.2.6-14
-- Rebuild (qt5)
-
-* Wed Apr 12 2023 Jan Grulich <jgrulich@redhat.com> - 1.2.6-13
-- Rebuild (qt5)
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jan 06 2023 Jan Grulich <jgrulich@redhat.com> - 1.2.6-11
-- Rebuild (qt5)
-
-* Mon Oct 31 2022 Jan Grulich <jgrulich@redhat.com> - 1.2.6-10
-- Rebuild (qt5)
-
-* Wed Sep 21 2022 Jan Grulich <jgrulich@redhat.com> - 1.2.6-9
-- Rebuild (qt5)
-
-* Sun Jul 24 2022 Qiyu Yan <yanqiyu@fedoraproject.org> - 1.2.6-8
-- rebuild for QT5 5.15.4 (#2107799)
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jun 01 2022 Qiyu Yan <yanqiyu@fedoraproject.org> - 1.2.6-6
-- rebuild for QT5 5.15.3
-
-* Tue Mar 08 2022 Jan Grulich <jgrulich@redhat.com> - 1.2.6-5
-- Rebuild (qt5)
-
-* Fri Jan 21 2022 Qiyu Yan <yanqiyu@fedoraproject.org> - 1.2.6-4
-- rebuild to qt5 5.15.2 #(2043318)
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sat Apr 24 2021 Qiyu Yan <yanqiyu@fedoraproject.org> - 1.2.6-1
-- Update to 1.2.6 upstream release
-- Fixes 1950838
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Nov 23 07:52:09 CET 2020 Jan Grulich <jgrulich@redhat.com> - 1.2.5-3
-- rebuild (qt5)
-
-* Fri Sep 11 2020 Jan Grulich <jgrulich@redhat.com> - 1.2.5-2
-- rebuild (qt5)
-
-* Thu Aug 06 2020 Qiyu Yan <yanqiyu@fedoraproject.org> - 1.2.5-1
-- update to 1.2.5 upstream release
-
-* Tue Aug 04 2020 Qiyu Yan <yanqiyu@fedoraproject.org> - 1.2.4-7
-- Improve compatibility with new CMake macro
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-6
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Apr 06 2020 Rex Dieter <rdieter@fedoraproject.org> - 1.2.4-4
-- rebuild (qt5)
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Dec 09 2019 Jan Grulich <jgrulich@redhat.com> - 1.2.4-2
-- rebuild (qt5)
-
 * Sun Dec  1 2019 Robin Lee <cheeselee@fedoraproject.org> - 1.2.4-1
 - Release 1.2.4
 

sources

@@ -1 +1 @@
-SHA512 (fcitx-qt5-1.2.6.tar.xz) = 466fdbb1bfaab58fe326c3594fd9fca9054a8be61c635b5421ba2529e4b1bd334627cc98aca5b5bb046bdaadc1e8636bc4bff0badfc3644c46e40d82a37d19ff
+SHA512 (fcitx-qt5-1.2.4.tar.xz) = c9ceaaedeb26ac4c7fa1e0bf34096725afc14642b795d9c624f4fc7fbf56c04acad12d8d3ffb60c164281b6373554c0524e56209a2d1d123fbf348d15dcc282a