From 3a9af617de4512585c9ae66ed99e4907a9667ec8 Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dchen@fedoraproject.org>
Date: May 22 2009 05:26:53 +0000
Subject: Applied Lubomir Rintel's patch


---

diff --git a/.cvsignore b/.cvsignore
index df77ab6..cecf5d7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ibus-chewing-1.0.10.20090522-Source.tar.gz
+ibus-chewing-1.0.10.20090523-Source.tar.gz
diff --git a/ibus-chewing.spec b/ibus-chewing.spec
index ec62871..f8cfaa6 100644
--- a/ibus-chewing.spec
+++ b/ibus-chewing.spec
@@ -1,5 +1,5 @@
 Name:       ibus-chewing
-Version:    1.0.10.20090522
+Version:    1.0.10.20090523
 Release:    1%{?dist}
 Summary:    The Chewing engine for IBus input platform
 License:    GPLv2+
@@ -43,9 +43,13 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %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
 
 %post
@@ -72,13 +76,11 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
-* Fri May 22 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.10.20090522-1
-  Now the 1st down key brings the longest possible phrases.
-  The 2nd down key brings the 2nd longest possible phrases from the back,
-  unlike the previous versions where the cursor stays in the head of longest phrase.
-- Add force lowercase in English mode option.
-- Fix double free issue when destroy ibus-chewing.
-- Hide ibus-chewing-panel when ibus-chewing is focus-out
+* Fri May 22 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.10.20090523-1
+
+
+* Fri May 22 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.10.20090523-1
+
 
 * Mon May 11 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.9.20090508-1
   Now commit is forced when switch of ibus-chewing or current application loses focus.
@@ -110,6 +112,9 @@ Fix the errors which Funda Wang as pointing out:
 - Work around of easy symbol input.
 - Fix iBus Google issue 310.
 
+* Sun Mar 22 2009 Lubomir Rintel <lkundrak@v3.sk> - 1.0.3.20090311-2
+- Properly reinstall the schema when updating from 1.0.2.20090303-1 or older
+
 * Wed Mar 11 2009 Ding-Yi Chen <dchen at redhat.com> - 1.0.3.20090311-1
 - IBus Google issue 305:  ibus-chewing.schema -> ibus-chewing.schemas
 - IBus Google issue 307:  hardcoded chewing datadir
@@ -159,3 +164,4 @@ Fix the errors which Funda Wang as pointing out:
 
 
 
+
diff --git a/import.log b/import.log
index 794289c..021b43e 100644
--- a/import.log
+++ b/import.log
@@ -10,3 +10,4 @@ ibus-chewing-1_0_8_20090424-1_fc10:HEAD:ibus-chewing-1.0.8.20090424-1.fc10.src.r
 ibus-chewing-1_0_8_20090428-1_fc10:HEAD:ibus-chewing-1.0.8.20090428-1.fc10.src.rpm:1240975132
 ibus-chewing-1_0_9_20090508-1_fc10:HEAD:ibus-chewing-1.0.9.20090508-1.fc10.src.rpm:1242003164
 ibus-chewing-1_0_10_20090522-1_fc11:HEAD:ibus-chewing-1.0.10.20090522-1.fc11.src.rpm:1242968289
+ibus-chewing-1_0_10_20090523-1_fc11:HEAD:ibus-chewing-1.0.10.20090523-1.fc11.src.rpm:1242969995
diff --git a/sources b/sources
index ae03b91..6c8e08c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-23c3c8ce06be0ee32778c34e48505846  ibus-chewing-1.0.10.20090522-Source.tar.gz
+cb10ef16e598fd24b7d71b42334671be  ibus-chewing-1.0.10.20090523-Source.tar.gz