[ibus-m17n] Update to 1.3.4-10
Daiki Ueno
ueno at fedoraproject.org
Mon May 13 06:57:05 UTC 2013
commit 0f1af8b1134069d0ac135a7e1cee0947914c951f
Author: Daiki Ueno <dueno at redhat.com>
Date: Mon May 13 15:56:29 2013 +0900
Update to 1.3.4-10
ibus-m17n-fix-data-location.patch | 25 +++++++++++++++++++++++++
ibus-m17n.spec | 22 ++++++++++++++++------
2 files changed, 41 insertions(+), 6 deletions(-)
---
diff --git a/ibus-m17n-fix-data-location.patch b/ibus-m17n-fix-data-location.patch
new file mode 100644
index 0000000..b99bfaf
--- /dev/null
+++ b/ibus-m17n-fix-data-location.patch
@@ -0,0 +1,25 @@
+From b0e03bac1f3b420ac1b7ac76d6008dd4ed942cbf Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno at unixuser.org>
+Date: Mon, 13 May 2013 15:45:33 +0900
+Subject: [PATCH] Fix ibus-m17n-preferences.ui location
+
+---
+ src/setup.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/setup.c b/src/setup.c
+index 513fabf..4de8fb1 100644
+--- a/src/setup.c
++++ b/src/setup.c
+@@ -570,7 +570,7 @@ setup_dialog_new (IBusConfig *config,
+
+ error = NULL;
+ if (gtk_builder_add_from_file (builder,
+- PKGDATADIR "setup/ibus-m17n-preferences.ui",
++ PKGDATADIR "/setup/ibus-m17n-preferences.ui",
+ &error) == 0) {
+ g_warning ("can't read ibus-m17n-preferences.ui: %s",
+ error->message);
+--
+1.8.1.4
+
diff --git a/ibus-m17n.spec b/ibus-m17n.spec
index 46d75ef..fff5363 100644
--- a/ibus-m17n.spec
+++ b/ibus-m17n.spec
@@ -1,19 +1,22 @@
%global require_ibus_version 1.4.0
Name: ibus-m17n
Version: 1.3.4
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: The M17N engine for IBus platform
License: GPLv2+
Group: System Environment/Libraries
URL: http://code.google.com/p/ibus/
Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
+# Upstreamed patches:
Patch0: ibus-m17n-HEAD.patch
-# Fedora specific patches (not upstreamable):
+Patch1: ibus-m17n-fix-data-location.patch
+
+# Fedora specific patches:
# Enable lv3:ralt_switch option for some Indic engines in default.xml.
-Patch1: ibus-m17n-xkb-options.patch
+Patch100: ibus-m17n-xkb-options.patch
# Don't make the status button clickable (maybe obsolete).
-Patch2: ibus-m17n-hide-title-status.patch
+Patch101: ibus-m17n-hide-title-status.patch
# The following BR is for autogen and not necessary when packging
# released tarballs.
@@ -38,8 +41,9 @@ the input table maps from m17n-db.
%setup -q
%patch0 -p1 -b .HEAD
-%patch1 -p1 -b .xkb-options
-%patch2 -p1 -b .hide-title-status
+%patch1 -p1 -b .fix-data-location
+%patch100 -p1 -b .xkb-options
+%patch101 -p1 -b .hide-title-status
NOCONFIGURE=1 ./autogen.sh
@@ -64,6 +68,12 @@ desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup-m17n.
%{_datadir}/applications/ibus-setup-m17n.desktop
%changelog
+* Mon May 13 2013 Daiki Ueno <dueno at redhat.com> - 1.3.4-10
+- Add ibus-m17n-fix-data-location.patch
+- Fix bug 962144 [abrt] ibus-m17n-1.3.4-9.fc19:
+ setup_dialog_load_config: Process /usr/libexec/ibus-setup-m17n was
+ killed by signal 11 (SIGSEGV)
+
* Wed May 1 2013 Daiki Ueno <dueno at redhat.com> - 1.3.4-9
- Update ibus-m17n-xkb-options.patch to set XKB option for Inscript2
- Fix bug 957993 - ibus-m17n doesn't automatically map Alt_R to AltGr
More information about the scm-commits
mailing list