[Fedora-i18n-bugs] [ibus-hangul/f15] Update to 1.4.1-1.
Daiki Ueno
ueno at fedoraproject.org
Tue Apr 17 04:29:48 UTC 2012
commit 46240f303cdfa7adc3612408ff3802a48916c5bd
Author: Daiki Ueno <ueno at unixuser.org>
Date: Tue Apr 17 13:29:41 2012 +0900
Update to 1.4.1-1.
.gitignore | 1 +
ibus-hangul-HEAD.patch | 518 -----------------------------------------
ibus-hangul-setup-gi.patch | 17 +-
ibus-hangul.spec | 19 +-
ibus-setup-hangul.png | Bin 6771 -> 0 bytes
ibus-setup-hangul.svg | 548 --------------------------------------------
sources | 2 +-
7 files changed, 19 insertions(+), 1086 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 35f81e3..cfe7325 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ ibus-hangul-1.3.0.20100329.tar.gz
/ibus-hangul-1.3.1.tar.gz
/ibus-hangul-1.3.2.tar.gz
/ibus-hangul-1.4.0.tar.gz
+/ibus-hangul-1.4.1.tar.gz
diff --git a/ibus-hangul-setup-gi.patch b/ibus-hangul-setup-gi.patch
index d753847..d76ac54 100644
--- a/ibus-hangul-setup-gi.patch
+++ b/ibus-hangul-setup-gi.patch
@@ -9,10 +9,10 @@ Subject: [PATCH] ibus-setup-hangul: use gobject-introspection instead ibus
setup/main.py | 65 +++++++++++++++++++++++++--------------------
2 files changed, 46 insertions(+), 39 deletions(-)
-Index: ibus-hangul-1.4.0/setup/keycapturedialog.py
+Index: ibus-hangul-1.4.1/setup/keycapturedialog.py
===================================================================
---- ibus-hangul-1.4.0.orig/setup/keycapturedialog.py
-+++ ibus-hangul-1.4.0/setup/keycapturedialog.py
+--- ibus-hangul-1.4.1.orig/setup/keycapturedialog.py
++++ ibus-hangul-1.4.1/setup/keycapturedialog.py
@@ -1,5 +1,5 @@
-import gtk
-import gtk.gdk as gdk
@@ -54,10 +54,10 @@ Index: ibus-hangul-1.4.0/setup/keycapturedialog.py
+ self.__key_str += Gdk.keyval_name(event.keyval)
self.__dialog.format_secondary_markup('<span size="large" weight="bold">%s</span>' % self.__key_str)
-Index: ibus-hangul-1.4.0/setup/main.py
+Index: ibus-hangul-1.4.1/setup/main.py
===================================================================
---- ibus-hangul-1.4.0.orig/setup/main.py
-+++ ibus-hangul-1.4.0/setup/main.py
+--- ibus-hangul-1.4.1.orig/setup/main.py
++++ ibus-hangul-1.4.1/setup/main.py
@@ -20,9 +20,9 @@
import sys
@@ -206,7 +206,7 @@ Index: ibus-hangul-1.4.0/setup/main.py
def __write(self, name, v):
return self.__config.set_value("engine/Hangul", name, v)
-@@ -194,13 +201,13 @@ if __name__ == "__main__":
+@@ -194,12 +201,13 @@ if __name__ == "__main__":
locale.bindtextdomain(config.gettext_package, config.localedir)
locale.bind_textdomain_codeset(config.gettext_package, "UTF-8")
@@ -217,7 +217,7 @@ Index: ibus-hangul-1.4.0/setup/main.py
+ if bus.is_connected():
+ Setup(bus).run()
+ else:
- message = _("IBus daemon is not started")
+ message = _("IBus daemon is not running.\nHangul engine settings cannot be saved.")
- dialog = gtk.MessageDialog(type = gtk.MESSAGE_ERROR,
- buttons = gtk.BUTTONS_CLOSE,
+ dialog = Gtk.MessageDialog(type = Gtk.MessageType.ERROR,
@@ -225,4 +225,3 @@ Index: ibus-hangul-1.4.0/setup/main.py
message_format = message)
dialog.run()
sys.exit(1)
-- Setup(bus).run()
diff --git a/ibus-hangul.spec b/ibus-hangul.spec
index 91ced3a..913eb3a 100644
--- a/ibus-hangul.spec
+++ b/ibus-hangul.spec
@@ -1,23 +1,20 @@
%global require_ibus_version 1.3.99
%global require_libhangul_version 0.1.0
-%if 0%{?fedora} > 15
+%if 0%{?fedora} > 15 || 0%{?rhel} > 6
%define have_bridge_hotkey 1
%else
%define have_bridge_hotkey 0
%endif
Name: ibus-hangul
-Version: 1.4.0
-Release: 5%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
Summary: The Hangul 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
-# To avoid binary patch, include copies of icon files.
-Source1: ibus-setup-hangul.png
-Source2: ibus-setup-hangul.svg
-Patch0: ibus-hangul-HEAD.patch
+#Patch0: ibus-hangul-HEAD.patch
Patch1: ibus-hangul-setup-gi.patch
%if %have_bridge_hotkey
Patch2: ibus-hangul-add-hangul-hotkey.patch
@@ -40,9 +37,7 @@ libhangul.
%prep
%setup -q
-cp %SOURCE1 %SOURCE2 setup
-sed -i 's!^[-+][-+][-+] .*\.svg$!#\0!' %PATCH0
-%patch0 -p1 -b .HEAD
+#patch0 -p1 -b .HEAD
%patch1 -p1 -b .setup-gi
%if %have_bridge_hotkey
@@ -87,6 +82,10 @@ fi
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Tue Apr 17 2012 Daiki Ueno <dueno at redhat.com> - 1.4.1-1
+- Update version to 1.4.1.
+- Check RHEL version as well as Fedora version.
+
* Tue Mar 6 2012 Daiki Ueno <dueno at redhat.com> - 1.4.0-5
- Revive <hotkey> in hangul.xml.
- Remove unnecessary BR: ibus.
diff --git a/sources b/sources
index 878ecb1..4e271b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78899076a928d612c0f72cf74633d6b0 ibus-hangul-1.4.0.tar.gz
+c9615a9f704a4c29252028407329e1c3 ibus-hangul-1.4.1.tar.gz
More information about the i18n-bugs
mailing list