From cb21fb20db401ab6169a629facb1c5944a97b263 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Wed, 16 Jan 2013 18:54:06 +0900 Subject: [PATCH] Bumped to 1.5.0 --- .gitignore | 1 + ibus-anthy-HEAD.patch | 24 ----------------------- ibus-anthy-xx-disable-prop-symbol.patch | 26 ++++++++++++------------- ibus-anthy.spec | 11 ++++++----- sources | 2 +- 5 files changed, 21 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 5853bf2..06d75ac 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ ibus-anthy.png /ibus-anthy-1.3.99.20120304.tar.gz /ibus-anthy-1.4.99.20120327.tar.gz /ibus-anthy-1.4.99.20121006.tar.gz +/ibus-anthy-1.5.0.tar.gz diff --git a/ibus-anthy-HEAD.patch b/ibus-anthy-HEAD.patch index 9f50cfa..8b13789 100644 --- a/ibus-anthy-HEAD.patch +++ b/ibus-anthy-HEAD.patch @@ -1,25 +1 @@ -From 80853b7b8b1f7c7bfe9bfc125ad55491925f6c8c Mon Sep 17 00:00:00 2001 -From: fujiwarat -Date: Wed, 12 Dec 2012 21:02:33 +0900 -Subject: [PATCH] Fixed to delete arch depended lines. (#884031) - ---- - engine/ibus-engine-anthy.in | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/engine/ibus-engine-anthy.in b/engine/ibus-engine-anthy.in -index 3b1c5fe..1b3fd68 100644 ---- a/engine/ibus-engine-anthy.in -+++ b/engine/ibus-engine-anthy.in -@@ -26,8 +26,6 @@ prefix=@prefix@ - datarootdir=@datarootdir@ - exec_prefix=@exec_prefix@ - libexecdir=@libexecdir@ --pyexecdir=@pyexecdir@ --export PYTHONPATH=@pyexecdir@:$PYTHONPATH - export IBUS_PREFIX=@prefix@ - export IBUS_ANTHY_PKGDATADIR=@datarootdir@/@PACKAGE@ - export LIBEXECDIR=$libexecdir --- -1.8.0 diff --git a/ibus-anthy-xx-disable-prop-symbol.patch b/ibus-anthy-xx-disable-prop-symbol.patch index 649175a..6d7d43b 100644 --- a/ibus-anthy-xx-disable-prop-symbol.patch +++ b/ibus-anthy-xx-disable-prop-symbol.patch @@ -1,6 +1,6 @@ ---- 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): +--- ibus-anthy/engine/engine.py.orig 2012-12-31 00:46:13.000000000 +0900 ++++ ibus-anthy/engine/engine.py 2013-01-16 17:53:40.922164419 +0900 +@@ -233,7 +233,7 @@ class Engine(IBus.EngineSimple): { 'description' : _("Input mode"), 'symbol' : symbol } input_mode_prop = IBus.Property(key=u'InputMode', prop_type=IBus.PropType.MENU, @@ -9,7 +9,7 @@ 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): +@@ -321,7 +321,7 @@ class Engine(IBus.EngineSimple): { 'description' : _("Typing method"), 'symbol' : symbol } typing_mode_prop = IBus.Property(key=u'TypingMode', prop_type=IBus.PropType.MENU, @@ -18,7 +18,7 @@ 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): +@@ -388,7 +388,7 @@ class Engine(IBus.EngineSimple): { 'description' : _("Segment mode"), 'symbol' : symbol } segment_mode_prop = IBus.Property(key=u'SegmentMode', prop_type=IBus.PropType.MENU, @@ -27,7 +27,7 @@ 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): +@@ -464,7 +464,7 @@ class Engine(IBus.EngineSimple): { 'description' : _("Dictionary mode"), 'symbol' : short_label } dict_mode_prop = IBus.Property(key=u'DictMode', prop_type=IBus.PropType.MENU, @@ -36,8 +36,8 @@ 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 +@@ -793,7 +793,7 @@ class Engine(IBus.EngineSimple): + Engine.__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)) @@ -45,7 +45,7 @@ self.update_property(prop) self.__reset() -@@ -771,7 +771,7 @@ class Engine(IBus.EngineSimple): +@@ -821,7 +821,7 @@ class Engine(IBus.EngineSimple): Engine.__typing_mode = mode prop = self.__prop_dict[u'TypingMode'] prop.set_symbol(IBus.Text.new_from_string(symbol)) @@ -54,7 +54,7 @@ self.update_property(prop) self.__reset() -@@ -793,7 +793,7 @@ class Engine(IBus.EngineSimple): +@@ -846,7 +846,7 @@ class Engine(IBus.EngineSimple): _prop.set_state(IBus.PropState.CHECKED) self.update_property(_prop) prop.set_symbol(IBus.Text.new_from_string(symbol)) @@ -63,8 +63,8 @@ self.update_property(prop) def __segment_mode_activate(self, prop_name, state): -@@ -818,7 +818,7 @@ class Engine(IBus.EngineSimple): - self.__segment_mode = mode +@@ -871,7 +871,7 @@ class Engine(IBus.EngineSimple): + Engine.__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)) @@ -72,7 +72,7 @@ self.update_property(prop) self.__reset() -@@ -883,7 +883,7 @@ class Engine(IBus.EngineSimple): +@@ -936,7 +936,7 @@ class Engine(IBus.EngineSimple): label = _("%(description)s (%(symbol)s)") % \ { 'description' : _("Dictionary mode"), 'symbol' : symbol } prop.set_symbol(IBus.Text.new_from_string(symbol)) diff --git a/ibus-anthy.spec b/ibus-anthy.spec index ddfd1e1..1b8ddf5 100644 --- a/ibus-anthy.spec +++ b/ibus-anthy.spec @@ -1,11 +1,11 @@ %global sub_version 1.0 -%global require_ibus_version 1.4.99.20120203 +%global require_ibus_version 1.5.1 %global have_default_layout 1 %global have_bridge_hotkey 1 Name: ibus-anthy -Version: 1.4.99.20121006 -Release: 3%{?dist} +Version: 1.5.0 +Release: 1%{?dist} Summary: The Anthy engine for IBus input platform License: GPLv2+ Group: System Environment/Libraries @@ -14,7 +14,6 @@ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz # Upstreamed patches. # Patch0: %%{name}-HEAD.patch -Patch0: %{name}-HEAD.patch %if (0%{?fedora} <= 17 && 0%{?rhel} < 7) # IBusProperty.symbol is not used by ibus-gjs @@ -55,7 +54,6 @@ for developers. %prep %setup -q # %%patch0 -p1 -%patch0 -p1 %if (0%{?fedora} <= 17 && 0%{?rhel} < 7) %patch91 -p1 @@ -126,6 +124,9 @@ touch --no-create %{_datadir}/icons/hicolor || : %{_libdir}/libanthygobject-%{sub_version}.so %changelog +* Wed Jan 16 2013 Takao Fujiwara - 1.5.0-1 +- Bumped to 1.5.0 + * Wed Dec 12 2012 Takao Fujiwara - 1.4.99.20121006-3 - Resolved #884031. Deleted arch depended files. diff --git a/sources b/sources index 20ba12e..9978262 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -518aa503ce40054e0027f2a79c9df640 ibus-anthy-1.4.99.20121006.tar.gz +4ff000bec3c342f5cd5a6d9e05a4abdf ibus-anthy-1.5.0.tar.gz