[ibus-chewing] Use GSettings instead of GConf2; MakerDialog no longer invoke GUI on startup.

Ding-Yi Chen dchen at fedoraproject.org
Thu Dec 11 02:01:14 UTC 2014


commit 8d6ec4677aaad9a54d8762acc1de1500be520b9e
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Thu Dec 11 12:01:23 2014 +1000

    Use GSettings instead of GConf2; MakerDialog no longer invoke GUI on startup.

 .gitignore        |    1 +
 ibus-chewing.spec |  100 +++++++++++++++++++++++++---------------------------
 sources           |    2 +-
 3 files changed, 50 insertions(+), 53 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 48cdc53..0680d9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ ibus-chewing-1.3.6.20100730-Source.tar.gz
 /ibus-chewing-1.4.6-Source.tar.gz
 /ibus-chewing-1.4.7-Source.tar.gz
 /ibus-chewing-1.4.10.1-Source.tar.gz
+/ibus-chewing-1.4.11.1-Source.tar.gz
diff --git a/ibus-chewing.spec b/ibus-chewing.spec
index 85422e8..4bacbc6 100644
--- a/ibus-chewing.spec
+++ b/ibus-chewing.spec
@@ -1,30 +1,27 @@
 Name:           ibus-chewing
-Version:        1.4.10.1
-Release:        3%{?dist}
-Summary:        The Chewing engine for IBus input platform
+Version:        1.4.11.1
+Release:        1%{?dist}
 Summary:        The Chewing engine for IBus input platform
+Summary(zh_TW): IBus新酷音輸入法
 License:        GPLv2+
 Group:          System Environment/Libraries
-URL:            http://code.google.com/p/ibus/
-Source0:        http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz
+URL:            https://github.com/definite/ibus-chewing
+Source0:        https://github.com/definite/ibus-chewing/releases/download/ibus-chewing/ibus-chewing-%{version}-Source.tar.gz
 
 BuildRequires:  cmake >= 2.6.2
-BuildRequires:  gob2 >= 2.0.16
 BuildRequires:  pkgconfig
-BuildRequires:  gtk2-devel
 BuildRequires:  ibus-devel >= 1.3
 BuildRequires:  libchewing-devel >= 0.3.3
+BuildRequires:  glib2-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  gob2 >= 2.0.16
 BuildRequires:  libX11-devel
-BuildRequires:  libXtst-devel
-BuildRequires:  gettext-devel
-BuildRequires:  GConf2-devel
-Requires:       GConf2
-Requires:       gtk2
+BuildRequires:  gettext
+BuildRequires:  findutils
 Requires:       ibus >= 1.3
 Requires:       libchewing >= 0.3.3
-Requires(pre):  GConf2
-Requires(post): GConf2
-Requires(preun):GConf2
+Requires:       gtk2
+Requires:       gettext
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -56,62 +53,61 @@ IBus-chewing 是新酷音輸入法的IBus前端。
 make VERBOSE=1 %{?_smp_mflags}
 make VERBOSE=1 translations
 
+%clean
+rm -rf %{buildroot}
+
 %install
-%__rm -rf %{buildroot}
+rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 # We install document using doc 
-(cd %{buildroot}/usr/share/doc/%{name}-%{version}
-   rm -fr *
-)
+rm -fr %{buildroot}%{_docdir}/*
 
 %find_lang %{name}
 
-%pre
-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
-
 
-%preun
-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 || :
+%postun
+if [ $1 -eq 0 ] ; then
+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-[ -x %{_bindir}/ibus ] && \
-  %{_bindir}/ibus write-cache --system &>/dev/null || :
-
-
-%postun
-[ -x %{_bindir}/ibus ] && \
-  %{_bindir}/ibus write-cache --system &>/dev/null || :
-
+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
-%clean
 
 %files -f %{name}.lang
-
-%defattr(-,root,root,-)
+%defattr(-, root, root, -)
 %doc AUTHORS README ChangeLog COPYING USER-GUIDE
-%{_libexecdir}/ibus-engine-chewing
-%config %{_sysconfdir}/gconf/schemas/ibus-chewing.schemas
+%{_datadir}/%{name}/icons/%{name}-orig.png
+%{_datadir}/%{name}/icons/%{name}.png
+%{_datadir}/%{name}/icons/ibus-setup-chewing.png
+%{_datadir}/applications/ibus-setup-chewing.desktop
+%{_datadir}/glib-2.0/schemas/org.freedesktop.IBus.Chewing.gschema.xml
 %{_datadir}/ibus/component/chewing.xml
-%{_datadir}/%{name}/icons
+%{_libexecdir}/ibus-engine-chewing
+%{_libexecdir}/ibus-setup-chewing
 
 %changelog
+* Thu Dec 11 2014 Ding-Yi Chen <dchen at redhat.com> - 1.4.11.1-1
+- Resolves Bug 1013977 - Slow focus change with ibus-chewing
+- Resolves Bug 1062133 - ibus-chewing may not handle key event after focus change
+- Resolves Bug 1073797 - Cannot identify input mode for Chinese IME (ibus-chewing)
+- Fixed Bug 902866 - ibus-chewing uses dconf but still installs gconf schemas
+  (Also listed as GitHub ibus-chewing #36)
+- MakerDialog GUI is only loaded when setting dialog is invoked.
+- Setting is removed from ibus-properties because it can be launched
+  from either:
+  + Executable ibus-setup-chewing: Usually under /usr/libexec
+  + Input method preference in IBus preference.
+- Fixed github issue #43: First space not able to input
+    Thanks FreedomKnight.
+- Fixed github issue #44: Update input-events (for libchewing-0.4.0)
+    Thanks hiunnhue.
+- Fixed github issue #45: Optimize properties handling.
+    Thanks Ueno.
+- github is now hosting the ibus-chewing tarballs.
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.10.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 25a8daf..553a8f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6039897806777cbf612fbc02e0b7b451  ibus-chewing-1.4.10.1-Source.tar.gz
+760cc5bc4bea90a52562c232e0ebf77f  ibus-chewing-1.4.11.1-Source.tar.gz


More information about the scm-commits mailing list