Accepting request 202437 from home:ftake:branches:M17N

Please pick this package for 13.1.

Update to 1.5.4 which includes bug fix and re-implementation of feature that was in openSUSE 12.3.

This update also contains a patch for usability improvement for 13.1.

OBS-URL: https://build.opensuse.org/request/show/202437
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=76
This commit is contained in:
2013-10-06 18:30:30 +00:00
committed by Git OBS Bridge
parent 7e4f26e7ac
commit 521e2d454a
7 changed files with 259 additions and 258 deletions

View File

@@ -19,7 +19,7 @@
%define with_automatic_config 1
Name: ibus
Version: 1.5.3
Version: 1.5.4
Release: 0
Url: http://code.google.com/p/ibus/
Summary: Intelligent Input Bus for Linux OS
@@ -32,11 +32,13 @@ Source3: xim.ibus.suse.template
Source4: xim.d-ibus-121
%if %{with_automatic_config}
Patch0: ibus-python-install-dir.patch
# PATCH-FEATURE-UPSTREAM add-libgnomekbd-and-load-preload-engines-69171c9c.patch Issue 1641 ftake@geeko.jp
Patch1: add-libgnomekbd-and-load-preload-engines-69171c9c.patch
# PATCH-FEATURE-UPSTREAM reload-preload-engines-until-users-customize-the-list-95fd937e.patch Issue 1641 ftake@geeko.jp
Patch2: reload-preload-engines-until-users-customize-the-list-95fd937e.patch
# PATCH-FEATURE-UPSTREAM add-libgnomekbd-and-load-preload-engines.patch Issue 1641 ftake@geeko.jp
Patch1: add-libgnomekbd-and-load-preload-engines.patch
# PATCH-FEATURE-UPSTREAM reload-preload-engines-until-users-customize-the-list.patch Issue 1641 ftake@geeko.jp
Patch2: reload-preload-engines-until-users-customize-the-list.patch
%endif
# PATCH-FIX-OPENSUSE reload-preload-engines-until-users-customize-the-list.patch ftake@geeko.jp
Patch3: show-input-mode-icon.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: /usr/bin/touch
Provides: locale(ja;ko;zh)
@@ -78,6 +80,7 @@ Requires: typelib-1_0-Gtk-2_0
Requires: typelib-1_0-Gtk-3_0
%endif
Obsoletes: ibus-gnome-shell
Recommends: %{name}-lang
#Fix cursor following problem in KDE4 for libreoffice, libreoffice-kde and libreoffice-kde4 can destroy cursor following, please don't install them with ibus.
Supplements: packageand(libreoffice:libreoffice-gnome)
@@ -164,6 +167,8 @@ rm -f bindings/vala/ibus-1.0.vapi
rm -f data/dconf/00-upstream-settings
%endif
%patch3 -p1
%build
autoreconf -fi
intltoolize -f
@@ -216,10 +221,8 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
ln -sf %{_datadir}/icons/hicolor/48x48/apps/ibus-keyboard.png \
$RPM_BUILD_ROOT%{_datadir}/pixmaps/ibus-keyboard.png
%if 0%{suse_version} <= 1220
# touch for %%ghost
touch $RPM_BUILD_ROOT/%{_sysconfdir}/dconf/db/ibus
%endif
%suse_update_desktop_file %name-setup System Utility settings