From 66d25b3f4687124c954389073c9ac04a5e1c5e4999cfe635c3296b8ecda84dbc Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sat, 21 Jul 2012 12:43:55 +0000 Subject: [PATCH] Accepting request 128546 from home:MargueriteSu:branches:M17N version update OBS-URL: https://build.opensuse.org/request/show/128546 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=36 --- fcitx-4.2.5.tar.bz2 | 3 +++ fcitx.changes | 26 ++++++++++++++++++++++++++ fcitx.spec | 30 ++++++++++++++++++++++-------- 3 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 fcitx-4.2.5.tar.bz2 diff --git a/fcitx-4.2.5.tar.bz2 b/fcitx-4.2.5.tar.bz2 new file mode 100644 index 0000000..462b4fb --- /dev/null +++ b/fcitx-4.2.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd318ed7c239649387699a83e6856398a0c1e167cc2a4ec92467e3cf3afb6f74 +size 1949832 diff --git a/fcitx.changes b/fcitx.changes index 5545671..d531069 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Sat Jul 21 18:23:11 UTC 2012 - i@marguerite.su + +- update to 4.2.5 + *For user: + 1. Default 3 skin change to support a new feature that respect the DPI on the screen. + 2. Display current input method after switch the input method, and the hint window will disappear after a while. + 3. fcitx-keyboard wordhint now is a per input context option, not a global one. + 4. fcitx-xkb support loading custom xmodmap script when needed. + 5. fcitx-xkb support assign a default layout when there is no input method. + 6. fcitx-pinyin support fix like “jv -> ju” + 7. fcitx-pinyin add xiaohe support. + 8. fcitx-pinyin now can use “v” to trigger quick-phrase + 9. change zh_HK punctutation map for “$” from ￥ to ＄. + 10. support typing unicode character via “ctrl+shift+alt+u” + 11. shift for default “active-inactive” switch, and can be only used after switch from “active to inactive” by default. + 12. safer for handling signal and exit. + 13. restart is displayed on the UI (both classic and kimpanel) + 14. log message now includes pid. + *For API: + 1. add timeout support. + 2. add per-inputcontext data support + 3. move all keysym to fcitx-utils. + *For module: + 1. Quickphrase can be triggered via cross module call. + ------------------------------------------------------------------- Sat Jun 16 14:32:39 UTC 2012 - i@marguerite.su diff --git a/fcitx.spec b/fcitx.spec index 8aa97b0..01923ef 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -16,10 +16,10 @@ # -%define libver -4_2_4 +%define libver -4_2_5 Name: fcitx -Version: 4.2.4.1 +Version: 4.2.5 Release: 0 Summary: Flexible Context-aware Input Tool with eXtension License: GPL-2.0+ @@ -37,8 +37,6 @@ Source6: table.tar.gz Source7: xinput-fcitx #FIX-FOR-UPSTREAM i@marguerite.su - dont download online Patch1: fix_fcitx_googlecode_resolv_error.patch -#FIX-FOR-UPSTREAM wengxuetian@gmail.com - fix memeory overflow -Patch2: fix-fcitx-4.2.4.1-memory-overflow.patch BuildRequires: cairo-devel %if 0%{?suse_version} BuildRequires: dbus-1-devel @@ -102,6 +100,7 @@ Pinyin and QuWei input methods. It's flexible and fast. %package -n lib%{name}%{libver} Summary: Shared libraries for %{name} Group: System/I18n/Chinese +Obsoletes: lib%{name}%{libver} < %{version} %description -n lib%{name}%{libver} Shared libraries for Fcitx input method framework. @@ -144,6 +143,16 @@ Requires(postun): gtk3 %description gtk3 GTK+ version 3 input module for Fcitx input method framework. +%package -n typelib-1_0-Fcitx-1_0 +Summary: The Flexible Context-aware Input Tool with eXtension -- Introspection bindings +Group: System/Libraries + +%description -n typelib-1_0-Fcitx-1_0 +Fcitx is a CJK input method framework. It supports Table, +Pinyin and QuWei input methods. It's flexible and fast. + +This package provides the GObject Introspection bindings for Fcitx. + %endif %if 0%{?suse_version} > 1110 || 0%{?fedora_version} @@ -325,8 +334,6 @@ You can either use this package for download from kde-look.org using knewstaff i %prep %setup -q -n %{name}-%{version} %patch1 -p1 -# remove when next release -%patch2 -p1 %build mkdir build @@ -512,6 +519,7 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %defattr(-,root,root) %{_bindir}/%{name} %{_bindir}/%{name}4-config +%{_bindir}/%{name}-autostart %{_bindir}/%{name}-configtool %{_bindir}/%{name}-remote %{_bindir}/%{name}-skin-installer @@ -530,6 +538,7 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %config %{_sysconfdir}/X11/xinit/xinput.d/ %{_docdir}/packages/%{name}/ %endif +%config %{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop # excludes %exclude %{_datadir}/%{name}/pinyin @@ -561,8 +570,10 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %files gtk3 %defattr(-,root,root) %{_libdir}/gtk-3.0/* + +%files -n typelib-1_0-Fcitx-1_0 +%defattr(-,root,root) %{_libdir}/girepository-1.0/Fcitx-1.0.typelib -%{_datadir}/gir-1.0/Fcitx-1.0.gir %endif @@ -665,9 +676,12 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %files devel %defattr(-,root,root) +%{_includedir}/* %{_libdir}/pkgconfig/*.pc %{_datadir}/cmake/ -%{_includedir}/* +%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +%{_datadir}/gir-1.0/Fcitx-1.0.gir +%endif %if 0%{?suse_version} > 1110 || 0%{?fedora_version}