Accepting request 321616 from home:ftake:branches:M17N

upstream update and bug fix

OBS-URL: https://build.opensuse.org/request/show/321616
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=144
This commit is contained in:
2015-08-10 13:44:14 +00:00
committed by Git OBS Bridge
parent 78c449f809
commit 066f1fced6
8 changed files with 79 additions and 67 deletions

View File

@@ -30,7 +30,7 @@
%endif
Name: ibus
Version: 1.5.10
Version: 1.5.11
Release: 0
Summary: Intelligent Input Bus for Linux OS
License: LGPL-2.1+
@@ -66,7 +66,7 @@ Patch7: ibus-python3-migration.patch
# Select an IM engine at the first login
Patch8: im-engines-precede-xkb.patch
# PATCH-FIX-UPSTREAM ftake@geeko.jp
Patch9: appindicator-absolute-icon-path.patch
Patch9: ibus-fix-check-abs-icon-path-support.patch
BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-1-python-devel >= 0.83.0
BuildRequires: dconf-devel >= 0.7.5
@@ -102,6 +102,11 @@ BuildRequires: pkgconfig(vapigen)
BuildRequires: pkgconfig(wayland-client) >= 1.2.0
%endif
BuildRequires: pkgconfig(xkbcommon)
# It seems that old vala compiler cannot build with an incompatible
# return type error among two overriding functions with
# "GLib.Variant?" type
# 13.1 support should be dropped after the cause is confirmed
BuildRequires: vala >= 0.26.0
Requires: dbus-1-python
Requires: dconf
Requires: iso-codes
@@ -260,10 +265,11 @@ intltoolize -f
%if %{with_wayland}
--enable-wayland \
%endif
%if 0%{?suse_version} < 1320
%if 0%{?suse_version} < 1315
--disable-appindicator \
%endif
--enable-surrounding-text \
--enable-appindicator_engine_icon \
--libexecdir=%{_libdir}/ibus
make %{?_smp_mflags}