Merge branch 'master' into epel7

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

fcitx-qt5.spec

@@ -10,8 +10,6 @@ Summary:        Fcitx IM module for Qt5
 License:        GPLv2+ and BSD
 URL:            https://github.com/fcitx/fcitx-qt5
 Source0:        http://download.fcitx-im.org/%{name}/%{name}-%{version}.tar.xz
-
-BuildRequires:  cmake
 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
@@ -44,7 +42,11 @@ developing programs using fcitx-qt5 libraries.
 %build
 mkdir -pv build
 pushd build
+%if "%{?__cmake3}" != ""
+%cmake3 ..
+%else
 %cmake ..
+%endif
 popd
 make %{?_smp_mflags} -C build