Update to 4.2.9.6

Fix build for epel7
Update to 4.2.9.5
2018-04-01 23:40:40 +08:00 · 2018-02-01 15:30:06 +08:00 · 2018-02-01 15:16:54 +08:00 · 2018-02-01 15:15:28 +08:00 · 2016-03-29 11:11:36 +08:00
1 changed files with 35 additions and 9 deletions
--- a/fcitx.spec
+++ b/fcitx.spec
@ -13,11 +13,12 @@ Source0:		http://download.fcitx-im.org/fcitx/%{name}-%{version}_dict.tar.xz
 Source1:		xinput-%{name}
 BuildRequires:		gcc-c++
 BuildRequires:		pango-devel, dbus-devel, opencc-devel
-BuildRequires:		wget, intltool, chrpath, sysconftool, opencc
-BuildRequires:		cmake, libtool, doxygen, libicu-devel
+BuildRequires:		wget, intltool, chrpath, opencc
+BuildRequires:		cmake3, libtool, doxygen, libicu-devel
 BuildRequires:		qt4-devel, gtk3-devel, gtk2-devel, libicu
 BuildRequires:		xorg-x11-proto-devel, xorg-x11-xtrans-devel
 BuildRequires:		gobject-introspection-devel, libxkbfile-devel
+BuildRequires:		libxkbcommon-devel, libuuid-devel
 BuildRequires:		enchant-devel, iso-codes-devel, libicu-devel
 BuildRequires:		libX11-devel, dbus-glib-devel, dbus-x11
 BuildRequires:		desktop-file-utils, libxml2-devel
@ -145,7 +146,7 @@ This package contains table engine for Fcitx.
 %build
 mkdir -p build
 pushd build
-%cmake .. -DENABLE_GTK3_IM_MODULE=On -DENABLE_QT_IM_MODULE=On -DENABLE_OPENCC=On -DENABLE_LUA=On -DENABLE_GIR=On -DENABLE_XDGAUTOSTART=Off
+%cmake3 .. -DENABLE_GTK3_IM_MODULE=On -DENABLE_QT_IM_MODULE=On -DENABLE_OPENCC=On -DENABLE_LUA=On -DENABLE_GIR=On -DENABLE_XDGAUTOSTART=Off
 make VERBOSE=1 %{?_smp_mflags}

 %install
@ -178,18 +179,49 @@ desktop-file-install --delete-original \

 %post 
 %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 55 || :
+/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :

 %postun  
 if [ "$1" = "0" ]; then
  %{_sbindir}/alternatives --remove xinputrc %{_xinputconf} || :
  # if alternative was set to manual, reset to auto
  [ -L %{_sysconfdir}/alternatives/xinputrc -a "`readlink %{_sysconfdir}/alternatives/xinputrc`" = "%{_xinputconf}" ] && %{_sbindir}/alternatives --auto xinputrc || :
+  /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 fi
+/usr/bin/update-desktop-database &> /dev/null || :
+
+%posttrans
+/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :

 %post libs -p /sbin/ldconfig

 %postun libs -p /sbin/ldconfig

+%post data
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun data
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans data
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%post gtk2
+%{_bindir}/update-gtk-immodules %{_host} || :
+
+%postun gtk2
+%{_bindir}/update-gtk-immodules %{_host} || :
+
+%post gtk3
+%{_bindir}/gtk-query-immodules-3.0-%{__isa_bits} --update-cache || :
+
+%postun gtk3
+%{_bindir}/gtk-query-immodules-3.0-%{__isa_bits} --update-cache || :
+
 %files -f %{name}.lang
 %doc AUTHORS ChangeLog THANKS TODO
 %license COPYING
@ -317,12 +349,6 @@ fi
 * Thu Feb  1 2018 Robin Lee <cheeselee@fedoraproject.org> - 4.2.9.5-1
 - Update to 4.2.9.5

-* Sat Jan 06 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.2.9.4-3
- Remove obsolete scriptlets
-
-* Sat Jan 06 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.2.9.4-2
- Remove obsolete scriptlets
-
 * Thu Sep 28 2017 Robin Lee <cheeselee@fedoraproject.org> - 4.2.9.4-1
 - Update to 4.2.9.4 (BZ#1496438)
Author	SHA1	Message	Date
Robin Lee	97c3dfbb6a	Update to 4.2.9.6	2018-04-01 23:40:40 +08:00
Robin Lee	c078b65d09	Fix build for epel7	2018-02-01 15:30:06 +08:00
Li Rui Bin	3745f2779c	Update to 4.2.9.5	2018-02-01 15:16:54 +08:00
Li Rui Bin	87a174c2f2	Merge commit 'b0835018a0882cc22aa4e05b3d1088c961b17da8' into epel7	2018-02-01 15:15:28 +08:00
Peng Wu	751602c499	Fixes build	2016-03-29 11:11:36 +08:00