rpms/gnome-settings-daemon
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into f19

Browse Source 
Conflicts:
	gnome-settings-daemon.spec
This commit is contained in:
Jens Petersen 2013-05-09 16:24:31 +09:00
commit 9be49afa7b
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnome-settings-daemon-ibus-kkc-libpinyin.patch Normal file
View File

@ -0,0 +1,20 @@
--- gnome-settings-daemon-3.8.0/plugins/keyboard/gsd-keyboard-manager.c~ 2013-03-21 17:12:16.000000000 +0900
+++ gnome-settings-daemon-3.8.0/plugins/keyboard/gsd-keyboard-manager.c 2013-04-04 15:15:46.026364282 +0900
@@ -453,7 +453,7 @@
{ "bn_IN", "m17n:bn:inscript" },
{ "gu_IN", "m17n:gu:inscript" },
{ "hi_IN", "m17n:hi:inscript" },
- { "ja_JP", "anthy" },
+ { "ja_JP", "kkc" },
{ "kn_IN", "m17n:kn:kgp" },
{ "ko_KR", "hangul" },
{ "mai_IN", "m17n:mai:inscript" },
@@ -464,7 +464,7 @@
{ "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" },
};

9
gnome-settings-daemon.spec
View File

@ -1,6 +1,6 @@
Name: gnome-settings-daemon
Version: 3.8.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons
@ -10,6 +10,8 @@ URL: http://download.gnome.org/sources/%{name}
Source: http://download.gnome.org/sources/%{name}/3.8/%{name}-%{version}.tar.xz
# disable wacom for ppc/ppc64 (used on RHEL)
Patch0: %{name}-3.5.4-ppc-no-wacom.patch
# fedora has newer different default ibus engines for Chinese and Japanese
Patch1: %{name}-ibus-kkc-libpinyin.patch
Requires: control-center-filesystem
@ -76,6 +78,7 @@ The %{name}-updates package contains the updates plugin for %{name}
%if 0%{?rhel}
%patch0 -p1 -b .ppc-no-wacom
%endif
%patch1 -p1 -b .ibus-anthy-pinyin
autoreconf -i -f
@ -252,6 +255,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
%changelog
* Thu May 9 2013 Jens Petersen <petersen@redhat.com> - 3.8.1-2
- default ibus engine in Fedora is now kkc for Japanese
and libpinyin for Chinese (#948117)
* Tue Apr 16 2013 Richard Hughes <rhughes@redhat.com> - 3.8.1-1
- Update to 3.8.1