From 4d58cb5f0ba90d71fba7e52808216c359cafa95f Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Thu, 20 Dec 2012 18:42:15 +0000 Subject: [PATCH] Add patch to fix bug #873103 --- ...us-libpinyin-the-default-engine-for-.patch | 27 +++++++++++++++++++ gnome-settings-daemon.spec | 8 +++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-keyboard-Make-ibus-libpinyin-the-default-engine-for-.patch diff --git a/0001-keyboard-Make-ibus-libpinyin-the-default-engine-for-.patch b/0001-keyboard-Make-ibus-libpinyin-the-default-engine-for-.patch new file mode 100644 index 0000000..5b05428 --- /dev/null +++ b/0001-keyboard-Make-ibus-libpinyin-the-default-engine-for-.patch @@ -0,0 +1,27 @@ +From 994fcfffff2c7162dc9ef1a4243db0bbfa535388 Mon Sep 17 00:00:00 2001 +From: Rui Matos +Date: Thu, 20 Dec 2012 12:59:36 +0000 +Subject: [PATCH] keyboard: Make ibus-libpinyin the default engine for the + zh_CN locale + +This is now the default IBus pinyin engine in Fedora 18. +--- + plugins/keyboard/gsd-keyboard-manager.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c +index aa123c6..19ba139 100644 +--- a/plugins/keyboard/gsd-keyboard-manager.c ++++ b/plugins/keyboard/gsd-keyboard-manager.c +@@ -486,7 +486,7 @@ engine_from_locale (void) + { "sd_IN", "m17n:sd:inscript" }, + { "ta_IN", "m17n:ta:tamil99" }, + { "te_IN", "m17n:te:inscript" }, +- { "zh_CN", "pinyin" }, ++ { "zh_CN", "libpinyin" }, + { "zh_HK", "cangjie3" }, + { "zh_TW", "chewing" }, + }; +-- +1.8.0.1 + diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 69c7060..fb51df9 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,6 +1,6 @@ Name: gnome-settings-daemon Version: 3.6.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Group: System Environment/Daemons @@ -15,6 +15,8 @@ Patch2: 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch # Wacom OSD window # https://bugzilla.gnome.org/show_bug.cgi?id=679062 Patch3: 0001-wacom-implement-OSD-help-window.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=873103 +Patch4: 0001-keyboard-Make-ibus-libpinyin-the-default-engine-for-.patch Requires: control-center-filesystem @@ -83,6 +85,7 @@ The %{name}-updates package contains the updates plugin for %{name} %patch2 -p1 %patch3 -p1 -b .wacom-osd-window +%patch4 -p1 autoreconf -i -f @@ -259,6 +262,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/dbus-1/interfaces/org.gnome.SettingsDaemonUpdates.xml %changelog +* Thu Dec 20 2012 Rui Matos - 3.6.3-2 +- Add patch to fix bug #873103 + * Wed Nov 14 2012 Kalev Lember - 3.6.3-1 - Update to 3.6.3 - Drop the static man page patch and BR docbook-style-xsl instead