diff --git a/.gitignore b/.gitignore index 87e4e29..a1eacb3 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ ibus-chewing-1.3.6.20100730-Source.tar.gz /ibus-chewing-1.4.12-Source.tar.gz /ibus-chewing-1.4.13-Source.tar.gz /ibus-chewing-1.4.14-Source.tar.gz +/ibus-chewing-1.5.0-Source.tar.gz diff --git a/ibus-chewing.spec b/ibus-chewing.spec index a30a3fc..70077db 100644 --- a/ibus-chewing.spec +++ b/ibus-chewing.spec @@ -1,6 +1,25 @@ +%if 0%{?el6} +%bcond_with gsettings +%bcond_without gconf2 +%else +%bcond_without gsettings +%bcond_with gconf2 +%endif + +%if %{with gsettings} +%global gsettings_support ON +%else +%global gsettings_support OFF +%endif + +%if %{with gconf2} +%global gconf2_support ON +%else +%global gconf2_support OFF +%endif Name: ibus-chewing -Version: 1.4.14 -Release: 5%{?dist} +Version: 1.5.0 +Release: 1%{?dist} Summary: The Chewing engine for IBus input platform Summary(zh_TW): IBus新酷音輸入法 License: GPLv2+ @@ -49,7 +68,7 @@ IBus-chewing 是新酷音輸入法的IBus前端。 %build # $RPM_OPT_FLAGS should be loaded from cmake macro. -%cmake -DCMAKE_FEDORA_ENABLE_FEDORA_BUILD=1 . +%cmake -DCMAKE_FEDORA_ENABLE_FEDORA_BUILD=1 -DGSETTINGS_SUPPORT=%{gsettings_support} -DGCONF2_SUPPORT=%{gconf2_support} . make VERBOSE=1 %{?_smp_mflags} %clean @@ -62,64 +81,75 @@ make install DESTDIR=%{buildroot} # We install document using doc rm -fr %{buildroot}%{_docdir}/* -# Register as an AppStream component to be visible in the software center -# -# NOTE: It would be *awesome* if this file was maintained by the upstream -# project, translated and installed into the right place during `make install`. -# -# See http://www.freedesktop.org/software/appstream/docs/ for more details. -# -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/chewing.appdata.xml < - - chewing.xml - CC0-1.0 - Chewing - Traditional Chinese input method - -

- The Chewing input method is designed for entering Traditional Chinese text. - Chewing helps you inputting Traditional Chinese by its pronunciation, in the - form of either Bopomofo/Zhuyin or Hanyu pinyin, as well as Chinese punctuation - marks and normal and full shape number and English alphabets. -

-

- Input methods are typing systems allowing users to input complex languages. - They are necessary because these contain too many characters to simply be laid - out on a traditional keyboard. -

-
- https://code.google.com/p/ibus/wiki/ChewingUserGuide - https://code.google.com/p/ibus/issues/list - https://code.google.com/p/ibus/wiki/FAQ - -
-EOF - %find_lang %{name} +%pre +%if "%{gconf2_support}" == "ON" +if [ "$1" -gt 1 ] ; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + [ -r %{_sysconfdir}/gconf/schemas/%{name}.schemas ] && + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : + + # Upgrading 1.0.2.20090302-1.fc11 or older? + [ -r %{_sysconfdir}/gconf/schemas/%{name}.schema ] && + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schema >/dev/null || : +fi +%endif + + +%preun +%if "%{gconf2_support}" == "ON" +if [ "$1" -eq 0 ] ; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : +fi +%endif + + %post -if [ $1 -eq 0 ] ; then - /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +%if "%{gsettings_support}" == "ON" +/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +%endif + +%if "%{gconf2_support}" == "ON" +if [ $1 -gt 1 ] ; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + [ -r %{_sysconfdir}/gconf/schemas/%{name}.schemas ] && gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : fi - [ -x %{_bindir}/ibus ] && %{_bindir}/ibus write-cache --system &>/dev/null || : +%endif +[ -x %{_bindir}/ibus ] && %{_bindir}/ibus write-cache --system &>/dev/null || : + %postun +%if "%{gsettings_support}" == "ON" /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : - [ -x %{_bindir}/ibus ] && %{_bindir}/ibus write-cache --system &>/dev/null || : +%endif +%if "%{gconf2_support}" == "ON" +if [ $1 -gt 1 ] ; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + [ -r %{_sysconfdir}/gconf/schemas/%{name}.schemas ] && + gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : +fi +%endif + +[ -x %{_bindir}/ibus ] && %{_bindir}/ibus write-cache --system &>/dev/null || : + %files -f %{name}.lang %defattr(-, root, root, -) %doc AUTHORS README ChangeLog COPYING USER-GUIDE +%{_datadir}/%{name}/icons/%{name}-chi-full.svg +%{_datadir}/%{name}/icons/%{name}-chi-half.svg +%{_datadir}/%{name}/icons/%{name}-eng-full.svg +%{_datadir}/%{name}/icons/%{name}-eng-half.svg %{_datadir}/%{name}/icons/%{name}-orig.png +%{_datadir}/%{name}/icons/%{name}-template.svg %{_datadir}/%{name}/icons/%{name}.png %{_datadir}/%{name}/icons/ibus-setup-chewing.png -%{_datadir}/appdata/*.appdata.xml %{_datadir}/applications/ibus-setup-chewing.desktop %{_datadir}/glib-2.0/schemas/org.freedesktop.IBus.Chewing.gschema.xml %{_datadir}/ibus/component/chewing.xml @@ -127,6 +157,26 @@ fi %{_libexecdir}/ibus-setup-chewing %changelog +* Thu May 05 2016 Ding-Yi Chen - 1.5.0-1 +- Enhancement: + * New option: "Clean pre-edit buffer when focus out" +- Fix: + * Fixed the issues found in static checks + * Fixed Bug 1182813 ibus-chewing crashes gedit in search box while window out of focus + a.k.a GitHub issue #28 + * Fixed GitHub issue #37 Cannot use cmake out of source build Cannot use cmake out of source build + * Fixed GitHub issue #47 CHEWING_DATADIR CMake variable name mismatch + * Fixed GitHub issue #61 GConf2 should be removed from INSTALL document + * Fixed GitHub issue #64 systray should be able to show the Chinese/English mode + * Fixed GitHub issue #68 CPU usage very high when switch to Chewing Engine + * Fixed Bug 1177198 - [abrt] ibus-chewing: XGetKeyboardControl(): ibus-engine-chewing killed by SIGSEGV + * Fixed Bug 1319403 - [RFE] ibus-chewing: New option: Caps Lock behavior + a.k.a. GitHub issue #66 + * Fixed Bug 1330194 - Ctrl-c failed to output as Ctrl-c + a.k.a. GitHub issue #69 + * Pull Request #67 Fix property "easy-symbol-input" is covered by "shift-toggle-chinese" + Thanks southernbear for providing this fix. + * Thu Feb 04 2016 Fedora Release Engineering - 1.4.14-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 1ebebcf..22c5169 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59ed79f21bad14b55c14a604cff36d32 ibus-chewing-1.4.14-Source.tar.gz +d053c2a797f285e80c42827f4ce6f2e7 ibus-chewing-1.5.0-Source.tar.gz