[ibus-chewing] Google Issue 1089, 1329, 1351, 1374, 1427; GitHub issue 5

Sun Jul 22 23:44:30 UTC 2012

commit dac242cc016b0a7d28e7742a6523642c4bafba29
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Jul 23 09:44:22 2012 +1000

    Google Issue 1089, 1329, 1351, 1374, 1427; GitHub issue 5

 .gitignore                              |    1 +
 ibus-chewing-696864-abrt-ibus-1.4.patch |   84 -------------------------------
 ibus-chewing-xx-build-error.patch       |   50 ------------------
 ibus-chewing.spec                       |   66 ++++++++++---------------
 sources                                 |    2 +-
 5 files changed, 28 insertions(+), 175 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index b4742de..951eabd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ ibus-chewing-1.3.6.20100730-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
+/ibus-chewing-1.4.0-Source.tar.gz
diff --git a/ibus-chewing.spec b/ibus-chewing.spec
index 5a87c6e..ffa4abd 100644
--- a/ibus-chewing.spec
+++ b/ibus-chewing.spec
@@ -1,6 +1,7 @@
+%global message_level 6
 Name:       ibus-chewing
-Version:    1.3.10
-Release:    4%{?dist}
+Version:    1.4.0
+Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 Summary(zh_TW): IBus新酷音輸入法
 License:    GPLv2+
@@ -12,22 +13,10 @@ 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
-Patch1:     ibus-chewing-xx-build-error.patch
-
+BuildRequires:  cmake >= 2.6.2
 
 # 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
-%else
 BuildRequires:  gob2 >= 2.0.16-4
-%endif
 BuildRequires:  libchewing-devel >= 0.3.2-16
 BuildRequires:  pkgconfig
 BuildRequires:  GConf2-devel
@@ -56,30 +45,22 @@ IBus-chewing 是新酷音輸入法的IBus前端。
 
 %prep
 %setup -q -n %{name}-%{version}-Source
-%patch1 -p1 -b .build
-
-# 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 .
+# $RPM_OPT_FLAGS should be loaded from cmake macro.
+
+%if 0%{?rhel} <= 6
+%cmake -DMANAGE_MESSAGE_LEVEL=%{message_level} -DGNOME_SHELL=0 .
 %else
-%cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo .
+%cmake -DMANAGE_MESSAGE_LEVEL=%{message_level} .
 %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.10
+(cd $RPM_BUILD_ROOT//usr/share/doc/ibus-chewing-1.4.0
  %__rm -rf RELEASE-NOTES.txt AUTHORS README ChangeLog COPYING USER-GUIDE
  )
 
@@ -120,17 +101,22 @@ fi
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.10-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Wed Mar 07 2012 Takao Fujiwara <tfujiwar at redhat.com> - 1.3.10-3
-- Rebuilt for ibus 1.4.99.20120304
-- Added ibus-chewing-xx-build-error.patch
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.10-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Oct 12 2011 Ding-Yi Chen <dchen at redhat.com> - 1.3.10-1
+* Sun Jul 22 2012 Ding-Yi Chen <dchen at redhat.com> - 1.4.0-1
+- Merge pull request #13 from hiroshiyui to Fix wrong data type conversion
+- Fixed: Google Issue 1079: Use shift key to switch to English mode in ibus-chewing
+	Also list as GitHub pull request #17
+- Fixed: Google Issue 1089: Ibus-chewing cause window flicker when compiz enabled
+- Fixed: Google Issue 1329, Github Issue 3: Merge with buganini at gmail.com
+- Fixed: Google Issue 1351: ibus-chewing 1.3.10 mistakenly send uncommitted charactor.
+- Fixed: Google Issue 1374: ibus-chewing: cannot save the preference with gnomeshell
+- Fixed: Google Issue 1427: ibus-chewing-1.3.10 is not compatible with ibus-1.4.0 and higher
+        Also list as GitHub pull request #16
+- Fixed: GitHub Issue 5: Word missing when with libchewing-0.3.3 and  ibus-chewing 1.3.10
+	Also list as GitHub pull request #15
+- Fixed: Launchpad bug: 1014456 bus-chewing deletes characters if too many of them are entered
+	Also list as GitHub pull request #19
+
+* Thu Dec 15 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
diff --git a/sources b/sources
index 7dbce72..813c5aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a447828ca9290dd6bdf2336b2889bb0  ibus-chewing-1.3.10-Source.tar.gz
+dcbb3b2b6f4d57f4964c8b5cf3421bd3  ibus-chewing-1.4.0-Source.tar.gz
