Merge branch 'master' into epel7

.gitignore

@@ -1,3 +1,4 @@
 /fcitx-qt5-1.0.2.tar.xz
 /fcitx-qt5-1.0.4.tar.xz
 /fcitx-qt5-1.0.5.tar.xz
+/fcitx-qt5-1.0.6.tar.xz

fcitx-qt5.spec

@@ -1,8 +1,8 @@
 %global project_name FcitxQt5
 
 Name:           fcitx-qt5
-Version:        1.0.5
-Release:        5%{?dist}
+Version:        1.0.6
+Release:        1%{?dist}
 Summary:        Fcitx IM module for Qt5
 
 # The entire source code is GPLv2+ except
@@ -16,7 +16,7 @@ BuildRequires:  libxkbcommon-devel
 BuildRequires:  extra-cmake-modules
 # The author requests that fcitx-qt5 should be rebuilt for each minor version of qt5
 BuildRequires:  qt5-qtbase-private-devel
-Requires:       qt5-qtbase%{?_isa} = %{_qt5_version}
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 %filter_provides_in %{_qt5_plugindir}/platforminputcontexts/libfcitxplatforminputcontextplugin.so
 %filter_setup
 
@@ -66,12 +66,20 @@ make install/fast DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -C build
 
 
 %changelog
-* Thu Jun 16 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.0.5-5
-- rebuild (Qt5)
+* Fri Oct 21 2016 Robin Lee <cheeselee@fedoraproject.org> - 1.0.6-1
+- Upate to 1.0.6 (BZ#1384262)
 
-* Sun Apr 24 2016 Robin Lee <cheeselee@fedoraproject.org> - 1.0.5-4
-- Build for epel7.
-- Rely on extra-cmake-modules to pull in a proper version of cmake
+* Tue Jul 19 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.0.5-7
+- use macro version of qt5 dep
+
+* Sun Jul 17 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.0.5-6
+- rebuild (qtbase)
+
+* Thu Jun 09 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.0.5-5
+- rebuild (qtbase)
+
+* Sun Apr 17 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.0.5-4
+- BR: qt5-qtbase-private-devel
 
 * Mon Mar 21 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.0.5-3
 - rebuild (Qt5)

sources

@@ -1 +1 @@
-35fe1a5b2ad0ec5e417bda0692a744c1  fcitx-qt5-1.0.5.tar.xz
+0a249121426becfe19168b1600dca7d9  fcitx-qt5-1.0.6.tar.xz