[ibus-anthy] Bumped to 1.4.99.20121006
Takao Fujiwara
fujiwara at fedoraproject.org
Sat Oct 6 13:25:19 UTC 2012
commit 50a115b4f67e759aedc564f567f914aef4db4213
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date: Sat Oct 6 22:14:13 2012 +0900
Bumped to 1.4.99.20121006
.gitignore | 1 +
ibus-anthy-xx-disable-prop-symbol.patch | 83 +++++++++++++++++++++++++++++++
ibus-anthy-xx-icon-symbol.patch | 69 -------------------------
ibus-anthy-xx-layout.patch | 40 ---------------
ibus-anthy.spec | 40 +++++++++++++--
sources | 2 +-
6 files changed, 119 insertions(+), 116 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 52fd07d..5853bf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ ibus-anthy.png
/ibus-anthy-1.2.7.tar.gz
/ibus-anthy-1.3.99.20120304.tar.gz
/ibus-anthy-1.4.99.20120327.tar.gz
+/ibus-anthy-1.4.99.20121006.tar.gz
diff --git a/ibus-anthy-xx-disable-prop-symbol.patch b/ibus-anthy-xx-disable-prop-symbol.patch
new file mode 100644
index 0000000..649175a
--- /dev/null
+++ b/ibus-anthy-xx-disable-prop-symbol.patch
@@ -0,0 +1,83 @@
+--- ibus-anthy/engine/engine.py.orig 2012-10-06 21:14:45.250978091 +0900
++++ ibus-anthy/engine/engine.py 2012-10-06 21:20:31.325649562 +0900
+@@ -204,7 +204,7 @@ class Engine(IBus.EngineSimple):
+ { 'description' : _("Input mode"), 'symbol' : symbol }
+ input_mode_prop = IBus.Property(key=u'InputMode',
+ prop_type=IBus.PropType.MENU,
+- label=IBus.Text.new_from_string(label),
++ label=IBus.Text.new_from_string(symbol),
+ symbol=IBus.Text.new_from_string(symbol),
+ icon='',
+ tooltip=IBus.Text.new_from_string(_("Switch input mode")),
+@@ -278,7 +278,7 @@ class Engine(IBus.EngineSimple):
+ { 'description' : _("Typing method"), 'symbol' : symbol }
+ typing_mode_prop = IBus.Property(key=u'TypingMode',
+ prop_type=IBus.PropType.MENU,
+- label=IBus.Text.new_from_string(label),
++ label=IBus.Text.new_from_string(symbol),
+ symbol=IBus.Text.new_from_string(symbol),
+ icon='',
+ tooltip=IBus.Text.new_from_string(_("Switch typing method")),
+@@ -355,7 +355,7 @@ class Engine(IBus.EngineSimple):
+ { 'description' : _("Segment mode"), 'symbol' : symbol }
+ segment_mode_prop = IBus.Property(key=u'SegmentMode',
+ prop_type=IBus.PropType.MENU,
+- label=IBus.Text.new_from_string(label),
++ label=IBus.Text.new_from_string(symbol),
+ symbol=IBus.Text.new_from_string(symbol),
+ icon=None,
+ tooltip=IBus.Text.new_from_string(_("Switch conversion mode")),
+@@ -420,7 +420,7 @@ class Engine(IBus.EngineSimple):
+ { 'description' : _("Dictionary mode"), 'symbol' : short_label }
+ dict_mode_prop = IBus.Property(key=u'DictMode',
+ prop_type=IBus.PropType.MENU,
+- label=IBus.Text.new_from_string(label),
++ label=IBus.Text.new_from_string(short_label),
+ symbol=IBus.Text.new_from_string(short_label),
+ icon=None,
+ tooltip=IBus.Text.new_from_string(_("Switch dictionary")),
+@@ -743,7 +743,7 @@ class Engine(IBus.EngineSimple):
+ self.__input_mode = mode
+ prop = self.__prop_dict[u'InputMode']
+ prop.set_symbol(IBus.Text.new_from_string(symbol))
+- prop.set_label(IBus.Text.new_from_string(label))
++ prop.set_label(IBus.Text.new_from_string(symbol))
+ self.update_property(prop)
+
+ self.__reset()
+@@ -771,7 +771,7 @@ class Engine(IBus.EngineSimple):
+ Engine.__typing_mode = mode
+ prop = self.__prop_dict[u'TypingMode']
+ prop.set_symbol(IBus.Text.new_from_string(symbol))
+- prop.set_label(IBus.Text.new_from_string(label))
++ prop.set_label(IBus.Text.new_from_string(symbol))
+ self.update_property(prop)
+
+ self.__reset()
+@@ -793,7 +793,7 @@ class Engine(IBus.EngineSimple):
+ _prop.set_state(IBus.PropState.CHECKED)
+ self.update_property(_prop)
+ prop.set_symbol(IBus.Text.new_from_string(symbol))
+- prop.set_label(IBus.Text.new_from_string(label))
++ prop.set_label(IBus.Text.new_from_string(symbol))
+ self.update_property(prop)
+
+ def __segment_mode_activate(self, prop_name, state):
+@@ -818,7 +818,7 @@ class Engine(IBus.EngineSimple):
+ self.__segment_mode = mode
+ prop = self.__prop_dict[u'SegmentMode']
+ prop.set_symbol(IBus.Text.new_from_string(symbol))
+- prop.set_label(IBus.Text.new_from_string(label))
++ prop.set_label(IBus.Text.new_from_string(symbol))
+ self.update_property(prop)
+
+ self.__reset()
+@@ -883,7 +883,7 @@ class Engine(IBus.EngineSimple):
+ label = _("%(description)s (%(symbol)s)") % \
+ { 'description' : _("Dictionary mode"), 'symbol' : symbol }
+ prop.set_symbol(IBus.Text.new_from_string(symbol))
+- prop.set_label(IBus.Text.new_from_string(label))
++ prop.set_label(IBus.Text.new_from_string(symbol))
+ self.update_property(prop)
+
+ def __argb(self, a, r, g, b):
diff --git a/ibus-anthy.spec b/ibus-anthy.spec
index e4d99ca..961e208 100644
--- a/ibus-anthy.spec
+++ b/ibus-anthy.spec
@@ -1,20 +1,26 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define require_ibus_version 1.4.99.20120203
-%define sub_version 1.0
-%define have_default_layout 1
-%define have_bridge_hotkey 1
+%define sub_version 1.0
+%define require_ibus_version 1.4.99.20120203
+%define have_default_layout 1
+%define have_bridge_hotkey 1
Name: ibus-anthy
-Version: 1.4.99.20120327
-Release: 2%{?dist}
+Version: 1.4.99.20121006
+Release: 1%{?dist}
Summary: The Anthy engine for IBus input platform
License: GPLv2+
Group: System Environment/Libraries
URL: http://code.google.com/p/ibus/
Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+
# Patch0: ibus-anthy-HEAD.patch
+%if 0%{?fedora} <= 17
+# IBusProperty.symbol is not used by ibus-gjs
+Patch91: ibus-anthy-xx-disable-prop-symbol.patch
+%endif
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: anthy-devel
@@ -50,6 +56,10 @@ for developers.
%setup -q
# patch0 -p1
+%if 0%{?fedora} <= 17
+%patch91 -p1
+%endif
+
%build
%configure \
%if %have_default_layout
@@ -72,6 +82,18 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libanthygobject-%{sub_version}.la
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+# recreate icon cache
+touch --no-create %{_datadir}/icons/hicolor || :
+[ -x %{_bindir}/gtk-update-icon-cache ] && \
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+# recreate icon cache
+touch --no-create %{_datadir}/icons/hicolor || :
+[ -x %{_bindir}/gtk-update-icon-cache ] && \
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
@@ -79,8 +101,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libanthygobject-%{sub_version}.so.*
%{_libdir}/girepository-1.0/Anthy*.typelib
%{_libexecdir}/ibus-*-anthy
+%{_datadir}/applications/ibus-setup-anthy.desktop
%{_datadir}/ibus-anthy
%{_datadir}/ibus/component/*
+%{_datadir}/icons/hicolor/scalable/apps/ibus-anthy.svg
%files devel
%{_datadir}/gir-1.0/Anthy*.gir
@@ -88,6 +112,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libanthygobject-%{sub_version}.so
%changelog
+* Sat Oct 06 2012 Takao Fujiwara <tfujiwar at redhat.com> - 1.4.99.20121006-1
+- Bumped to 1.4.99.20121006
+- Added ibus-anthy-xx-disable-prop-symbol.patch for Fedora 17
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.99.20120327-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index f8bc049..20ba12e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c426152e1aaf6782443e114b78425501 ibus-anthy-1.4.99.20120327.tar.gz
+518aa503ce40054e0027f2a79c9df640 ibus-anthy-1.4.99.20121006.tar.gz
More information about the scm-commits
mailing list