[ibus-chewing/f16] "Fixed 727018, 726335; Fixed Google issue 1245, 1274, 1281, 1303"

Wed Oct 12 13:52:16 UTC 2011

commit 99bb253bb2c6d439dd7103ccf0a0f91d01cc3a86
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Wed Oct 12 23:52:12 2011 +1000

     "Fixed 727018, 726335; Fixed Google issue 1245, 1274, 1281, 1303"

 .gitignore                              |    1 +
 ibus-chewing-696864-abrt-ibus-1.4.patch |   84 -------------------------------
 ibus-chewing.spec                       |   73 ++++++++++++++++++++-------
 sources                                 |    2 +-
 4 files changed, 57 insertions(+), 103 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 6d57d05..b4742de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ ibus-chewing-1.3.6.20100730-Source.tar.gz
 /ibus-chewing-1.3.8-Source.tar.gz
 /ibus-chewing-1.3.9-Source.tar.gz
 /ibus-chewing-1.3.9.2-Source.tar.gz
+/ibus-chewing-1.3.10-Source.tar.gz
diff --git a/ibus-chewing.spec b/ibus-chewing.spec
index ca43df0..11444fe 100644
--- a/ibus-chewing.spec
+++ b/ibus-chewing.spec
@@ -1,19 +1,26 @@
 Name:       ibus-chewing
-Version:    1.3.9.2
-Release:    3%{?dist}
+Version:    1.3.10
+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
-Patch0:	    ibus-chewing-696864-abrt-ibus-1.4.patch
 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  ibus-devel >= 1.1
 BuildRequires:  cmake >= 2.4
 
+%if 0%{?fedora} >= 14
+BuildRequires:  cmake-fedora >= 0.8.1
+%else
+Source1:    https://fedorahosted.org/releases/c/m/cmake-fedora/cmake-fedora-0.8.1-modules-only.tar.gz
+%endif
+
+
 # Make sure gob2 is patched against https://bugzilla.redhat.com/show_bug.cgi?id=519108
 %if 0%{?fedora} == 11
 BuildRequires:  gob2 >= 2.0.15-5
@@ -48,17 +55,29 @@ IBus-chewing 是新酷音輸入法的IBus前端。
 
 %prep
 %setup -q -n %{name}-%{version}-Source
-%patch0 -p1 -b .abrt-ibus-1.4
+
+# RHEL does not have cmake-fedora yet
+%if 0%{?fedora} < 13
+tar xzvf %{SOURCE1}
+%endif
+
 
 %build
 # $RPM_OPT_FLAGS should be  loaded from cmake macro.
+%if 0%{?fedora} >= 15
+%cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DGNOME_SHELL=1 .
+%else
+%cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo .
+%endif
+
 %cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo .
 %__make VERBOSE=1  %{?_smp_mflags}
 
 %install
+%__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT
 # We install document using %doc
-(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-chewing-1.3.9.2
+(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-chewing-1.3.10
  %__rm -rf RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING USER-GUIDE
  )
 
@@ -66,12 +85,15 @@ IBus-chewing 是新酷音輸入法的IBus前端。
 
 %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 || :
+    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 || :
+    [ -r %{_sysconfdir}/gconf/schemas/%{name}.schema ] &&
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schema\
+     >/dev/null || :
 fi
 
 %post
@@ -84,6 +106,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 fi
 
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING USER-GUIDE
@@ -93,13 +118,25 @@ fi
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Tue Apr 26 2011 Daiki Ueno <dueno at redhat.com> - 1.3.9.2-3
-- Apply a patch to fix crash with ibus 1.4
-- Resolves: #696864
-- defining and cleaning buildroot is deprecated (petersen)
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.9.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Wed Oct 12 2011 Ding-Yi Chen <dchen at redhat.com> - 1.3.10-1
+- Fixed Bug 726335 (Google issue 1281)- [abrt] ibus-chewing-1.3.9.2-3.fc15: g_atomic_int_get:
+  Process /usr/libexec/ibus-engine-chewing was killed by signal 11 (SIGSEGV) using patch from Scott Tsai
+- Fixed Bug 727018 - ibus compose file needs a symbol tag for gnome-shell
+- Fixed characters duplication problem (Google issue 1245, GitHub ibus-chewing issue 2)
+- Fixed KP-Enter not been able to commit preedit buffer. (Google issue 1303, GitHub ibus-chewing issue 4)
+- Depends on cmake-fedora now.
+- Fixed issue 1274, which is addressed by yusake's comments on d9009bf.
+- Add compile flag for GNOME3.
+- Add command line option: showFlags
+- ibus-gnome special symbol
+- Thanks Fred Chien's patch against that candidate window cannot be closed
+  with escape key since selected tone.
+- Thanks Fourdollar's patch for Fix plain zhuyin with space as selection problem.
+- Remove support for ibus-1.2 and prior.
+
+* Tue Feb 01 2011 Ding-Yi Chen <dchen at redhat.com> - 1.3.5.20100714-3
+- Resolves: #627794
+- Add USER-GUIDE
 
 * Fri Nov 19 2010 Ding-Yi Chen <dchen at redhat.com> - 1.3.9.2-1
 - Fixed Bug 652909
@@ -117,7 +154,7 @@ fi
 - Input style of ibus-chewing is decommissioned under ibus >=1.3.
   Now the input style is determined solely on the setting of
   "Embed preedit in application window" in IBus.
-- Resolves: #608991, #632043
+- Fixed: #608991, #632043
 - Fixed Issue 1022: chewing commit some text in reset method
   (patched by Peng Huang).
 - Fixed Issue 1032: [ibus-chewing] Chewing not commit some single Chinese
diff --git a/sources b/sources
index 7c5c493..7dbce72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d177d67647944f5d1f9cca0654eaccb  ibus-chewing-1.3.9.2-Source.tar.gz
+2a447828ca9290dd6bdf2336b2889bb0  ibus-chewing-1.3.10-Source.tar.gz
