diff --git a/baselibs.conf b/baselibs.conf index 51bcf4e..a474131 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -libfcitx-4_2_5 +libfcitx-4_2_6 fcitx-gtk2 fcitx-gtk3 fcitx-qt4 \ No newline at end of file diff --git a/fcitx-4.2.5.tar.bz2 b/fcitx-4.2.5.tar.bz2 deleted file mode 100644 index 462b4fb..0000000 --- a/fcitx-4.2.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd318ed7c239649387699a83e6856398a0c1e167cc2a4ec92467e3cf3afb6f74 -size 1949832 diff --git a/fcitx-4.2.6.tar.bz2 b/fcitx-4.2.6.tar.bz2 new file mode 100644 index 0000000..38711bb --- /dev/null +++ b/fcitx-4.2.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fa6f7b2ddb7de48aac5ead4f0ab68e5d6437504de353ca2f5610481388361d1 +size 8434363 diff --git a/fcitx.changes b/fcitx.changes index 379af31..2a2f503 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sat Sep 15 18:04:19 UTC 2012 - i@marguerite.su + +- update to 4.2.6 + * Add a private dbus service for Fcitx IM Module, simplify the setup on some light weight Desktop + * Improve “Select Character From Phrase” and Pinyin Symbol (typing special symbols in pinyin input + methods) as well as move them to a new Pinyin Enhance module, so that these features can now be + used in other pinyin input methods as well (previous just the builtin one). + * Move spell hint to a new module. Add a new spell hint backend using a builtin dictionary. Load + enchant and presage at runtime using dlopen() so that they are not link dependencies anymore. + * Spell hint for pinyin/AutoEng/QuickPhrase + * Bug fixes for Gtk IM Module + * Add more compile options so it is possible to compile a more simplified Fcitx if necessary + * Add long description (show as tooltip) and hidden options in configure files for a more user + friendly configure interface + * Add global font setting for classical UI + * Fix xkb support on BSD + * Other bug fixes + ------------------------------------------------------------------- Fri Sep 7 10:27:34 UTC 2012 - i@marguerite.su diff --git a/fcitx.spec b/fcitx.spec index b275416..1d819ea 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -16,10 +16,10 @@ # -%define libver -4_2_5 +%define libver -4_2_6 Name: fcitx -Version: 4.2.5 +Version: 4.2.6 Release: 0 Summary: Flexible Context-aware Input Tool with eXtension License: GPL-2.0+ @@ -31,13 +31,13 @@ Source: %{name}-%{version}.tar.bz2 Source1: xim.d-fcitx Source2: fcitx-README.suse Source3: xim.fcitx.suse.template -Source5: pinyin.tar.gz -Source6: table.tar.gz +#Source5: pinyin.tar.gz +#Source6: table.tar.gz # for fedora auto-start Source7: xinput-fcitx Source8: openSUSE-default.tar.gz #FIX-FOR-UPSTREAM i@marguerite.su - dont download online -Patch1: fix_fcitx_googlecode_resolv_error.patch +#Patch1: fix_fcitx_googlecode_resolv_error.patch BuildRequires: cairo-devel %if 0%{?suse_version} BuildRequires: dbus-1-devel @@ -357,7 +357,7 @@ You can either use this package for download from kde-look.org using knewstaff i %prep %setup -q -n %{name}-%{version} -%patch1 -p1 +#%patch1 -p1 %build mkdir build @@ -377,12 +377,12 @@ cmake .. -DENABLE_GTK2_IM_MODULE=On \ -DENABLE_LUA=On # copy external data -pushd ../data -cp -r %{S:5} ./ -popd -pushd ../data/table -cp -r %{S:6} ./ -popd +#pushd ../data +#cp -r %{S:5} ./ +#popd +#pushd ../data/table +#cp -r %{S:6} ./ +#popd # fix gobject-introspection build export SUSE_ASNEEDED=0 @@ -437,8 +437,8 @@ mkdir %{buildroot}%{_docdir}/packages/ mv %{buildroot}%{_datadir}/doc/%{name}/ %{buildroot}%{_docdir}/packages/ cp -r %{SOURCE2} %{buildroot}%{_docdir}/packages/%{name}/ cp -r %{SOURCE3} %{buildroot}%{_docdir}/packages/%{name}/ -cp -r AUTHORS %{buildroot}%{_docdir}/%{name}/ -cp -r ChangeLog %{buildroot}%{_docdir}/%{name}/ +cp -r AUTHORS %{buildroot}%{_docdir}/packages/%{name}/ +cp -r ChangeLog %{buildroot}%{_docdir}/packages/%{name}/ %endif # create autostart @@ -483,7 +483,7 @@ fdupes -n -q -r %{buildroot} %{__strip} %{buildroot}%{_libdir}/gtk-3.0/*/immodules/im-%{name}.so %endif %if 0%{?suse_version} > 1110 || 0%{?fedora_version} -%{__strip} %{buildroot}%{_libdir}/qt4/plugins/inputmethods/qtim-%{name}.so +#%{__strip} %{buildroot}%{_libdir}/qt4/plugins/inputmethods/qtim-%{name}.so %endif # Convenient define for the scriplets @@ -561,6 +561,7 @@ update-desktop-database %{_datadir}/applications &>/dev/null || %{_bindir}/%{name}-configtool %{_bindir}/%{name}-remote %{_bindir}/%{name}-skin-installer +%{_bindir}/%{name}-dbus-watcher %{_datadir}/%{name}/ %{_datadir}/applications/*.desktop %{_datadir}/icons/*