Accepting request 592248 from M17N

- update 4.2.9.6
  * [ipcportal] close connection first
  * [gtk] workaround libreoffice surrounding text issue
  * decrease the length of clipboard limit to 256 bytes
  * [gtk] use symbolic color name to lookup selected color 
- change fcitx-gtk2 and fcitx-qt4 from Requires to Recommends
- add fcitx-cmake-3.1.patch, downgrade cmake requirement to 3.1
  again for Leap

OBS-URL: https://build.opensuse.org/request/show/592248
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fcitx?expand=0&rev=60

fcitx-4.2.9.5_dict.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be398ac4433f6f4599d2728e20615e4f4602a5f67e9c29df4a3d4c1126d376ca
-size 8736972

fcitx-4.2.9.6_dict.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a59351bbae42d62aad61bd604154b8a49b822b3337ff4d2df5622881f680d943
+size 8738408

fcitx-cmake-3.1.patch

@@ -0,0 +1,25 @@
+Index: fcitx-4.2.9.6/CMakeLists.txt
+===================================================================
+--- fcitx-4.2.9.6.orig/CMakeLists.txt
++++ fcitx-4.2.9.6/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.6)
++cmake_minimum_required(VERSION 3.1)
+ 
+ project(fcitx)
+ 
+Index: fcitx-4.2.9.6/src/frontend/ipcportal/CMakeLists.txt
+===================================================================
+--- fcitx-4.2.9.6.orig/src/frontend/ipcportal/CMakeLists.txt
++++ fcitx-4.2.9.6/src/frontend/ipcportal/CMakeLists.txt
+@@ -2,8 +2,8 @@ set(FCITX_IPCPORTAL_LINK_LIBS)
+ if(_ENABLE_DBUS)
+   include_directories(${DBUS_INCLUDE_DIRS})
+   link_directories(${DBUS_LIBRARY_DIRS})
+-  pkg_check_modules(LibUUID "uuid" IMPORTED_TARGET REQUIRED)
+-  set(FCITX_IPCPORTAL_LINK_LIBS ${FCITX_IPCPORTAL_LINK_LIBS} ${DBUS_LIBRARIES} PkgConfig::LibUUID)
++  pkg_check_modules(LibUUID "uuid" REQUIRED)
++  set(FCITX_IPCPORTAL_LINK_LIBS ${FCITX_IPCPORTAL_LINK_LIBS} ${DBUS_LIBRARIES} -luuid)
+   set(ipcportal_noinstall)
+ else()
+   set(ipcportal_noinstall NO_INSTALL)

fcitx.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Mar 29 07:29:52 UTC 2018 - i@marguerite.su
+
+- update 4.2.9.6
+  * [ipcportal] close connection first
+  * [gtk] workaround libreoffice surrounding text issue
+  * decrease the length of clipboard limit to 256 bytes
+  * [gtk] use symbolic color name to lookup selected color 
+- change fcitx-gtk2 and fcitx-qt4 from Requires to Recommends
+- add fcitx-cmake-3.1.patch, downgrade cmake requirement to 3.1
+  again for Leap
+
 -------------------------------------------------------------------
 Tue Feb 27 09:34:05 UTC 2018 - dimstar@opensuse.org
 

fcitx.spec

@@ -19,13 +19,13 @@
 %define libver -4_2_9
 
 Name:           fcitx
-Version:        4.2.9.5
+Version:        4.2.9.6
 Release:        0
 Summary:        Flexible Context-aware Input Tool with eXtension
 License:        GPL-2.0-or-later
 Group:          System/I18n/Chinese
-Url:            http://code.google.com/p/fcitx
+Url:            https://github.com/fcitx/fcitx
-Source:         http://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz
+Source:         https://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz
 Source1:        xim.d-fcitx
 Source2:        fcitx-README.suse
 Source3:        xim.fcitx.suse.template
@@ -34,6 +34,8 @@ Source9:        macros.%{name}
 Source99:       baselibs.conf
 # PATCH-FIX-OPENSUSE fcitx-autostart-check-INPUT_METHOD.patch boo#947576
 Patch2:         fcitx-autostart-check-INPUT_METHOD.patch
+# PATCH-FIX-OPENSUSE downgrade cmake requirement to 3.1 again
+Patch3:         fcitx-cmake-3.1.patch
 BuildRequires:  cairo-devel
 BuildRequires:  cmake
 BuildRequires:  dbus-1-devel
@@ -60,10 +62,10 @@ BuildRequires:  xz
 BuildRequires:  pkgconfig(lua)
 BuildRequires:  pkgconfig(xkbcommon) >= 0.5.0
 BuildRequires:  pkgconfig(xkbfile)
-Requires:       %{name}-gtk2 = %{version}-%{release}
 Requires:       %{name}-gtk3 = %{version}-%{release}
-Requires:       %{name}-qt4 = %{version}-%{release}
 Requires:       lib%{name}%{libver} = %{version}-%{release}
+Recommends:     %{name}-gtk2 = %{version}-%{release}
+Recommends:     %{name}-qt4 = %{version}-%{release}
 Recommends:     %{name}-pinyin = %{version}-%{release}
 Recommends:     %{name}-table = %{version}-%{release}
 # These libraries are dlopen-ed in fcitx at runtime 
@@ -307,6 +309,7 @@ You can either use this package for download from kde-look.org using knewstaff i
 %prep
 %setup -q -n %{name}-%{version}
 %patch2 -p1
+%patch3 -p1
 
 %build
 mkdir build