[ibus] Bumped to 1.5.7
Takao Fujiwara
fujiwara at fedoraproject.org
Wed Apr 30 07:13:07 UTC 2014
commit fbd634d1f4c027130af35e892809e1c76fcf6911
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date: Wed Apr 30 15:43:20 2014 +0900
Bumped to 1.5.7
.gitignore | 1 +
ibus-HEAD.patch | 37 -------------------------------------
ibus.spec | 9 +++++----
sources | 2 +-
4 files changed, 7 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7b81f71..9bc24c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ ibus-1.3.6.tar.gz
/ibus-1.5.4.tar.gz
/ibus-1.5.5.tar.gz
/ibus-1.5.6.tar.gz
+/ibus-1.5.7.tar.gz
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index 31ad840..8b13789 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -1,38 +1 @@
-From 9782a20c544001a211a788975f55ded5064b7273 Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1 at gmail.com>
-Date: Tue, 18 Mar 2014 11:41:33 +0900
-Subject: [PATCH] Add Czech (qwerty) keymap.
-
-BUG=rhbz#1074879
-
-Review URL: https://codereview.appspot.com/74520044
----
- engine/simple.xml.in | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/engine/simple.xml.in b/engine/simple.xml.in
-index 4218f6c..b3ac6a5 100644
---- a/engine/simple.xml.in
-+++ b/engine/simple.xml.in
-@@ -203,6 +203,18 @@
- <icon>ibus-keyboard</icon>
- <rank>99</rank>
- </engine>
-+ <engine>
-+ <name>xkb:cz:qwerty:cze</name>
-+ <language>cze</language>
-+ <license>GPL</license>
-+ <author>Peng Huang <shawn.p.huang at gmail.com></author>
-+ <layout>cz</layout>
-+ <layout_variant>qwerty</layout_variant>
-+ <longname>Czech (qwerty)</longname>
-+ <description>Czech (qwerty)</description>
-+ <icon>ibus-keyboard</icon>
-+ <rank>99</rank>
-+ </engine>
- <engine>
- <name>xkb:dk::dan</name>
- <language>dan</language>
---
-1.8.5.3
diff --git a/ibus.spec b/ibus.spec
index 10f3796..cc996d2 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -35,8 +35,8 @@
%global dbus_python_version 0.83.0
Name: ibus
-Version: 1.5.6
-Release: 3%{?dist}
+Version: 1.5.7
+Release: 1%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
Group: System Environment/Libraries
@@ -49,7 +49,6 @@ Source2: %{name}.conf.5
Source3: https://github.com/ibus/ibus-xkb/archive/ibus-xkb-%{ibus_xkb_version}.tar.gz
# Upstreamed patches.
# Patch0: %%{name}-HEAD.patch
-Patch0: %{name}-HEAD.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=810211
Patch1: %{name}-810211-no-switch-by-no-trigger.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=541492
@@ -249,7 +248,6 @@ The ibus-devel-docs package contains developer documentation for ibus
%prep
%setup -q
# %%patch0 -p1
-%patch0 -p1
%if (0%{?fedora} < 20 && 0%{?rhel} < 8)
%patch96 -p1 -b .passwd
%endif
@@ -466,6 +464,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Apr 30 2014 Takao Fujiwara <tfujiwar at redhat.com> - 1.5.7-1
+- Bumped to 1.5.7
+
* Mon Apr 21 2014 Takao Fujiwara <tfujiwar at redhat.com> - 1.5.6-3
- Do not require gtk-doc in ibus-devel-docs
diff --git a/sources b/sources
index 9337c96..1b21be7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cd05de3423937928480d53d9f0ade861 ibus-1.5.6.tar.gz
+87f2269ef9523733a5693f0ed410ea71 ibus-1.5.7.tar.gz
c0bc5be7f0c068bea1e4785c5b60694b ibus-xkb-1.5.0.20140114.tar.gz
More information about the scm-commits
mailing list