Accepting request 215558 from home:ftake:branches:M17N

upstream update to 1.5.5

OBS-URL: https://build.opensuse.org/request/show/215558
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=91

ibus.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ibus
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %define with_automatic_config 1
 
 Name:           ibus
-Version:        1.5.4
+Version:        1.5.5
 Release:        0
 Url:            http://code.google.com/p/ibus/
 Summary:        Intelligent Input Bus for Linux OS
@@ -32,17 +32,16 @@ Source3:        xim.ibus.suse.template
 Source4:        xim.d-ibus-121
 Source5:        kde.tar.gz
 Source6:        kde-12.2.tar.gz
-%if %{with_automatic_config}
 Patch0:         ibus-python-install-dir.patch
 # PATCH-FEATURE-UPSTREAM add-libgnomekbd-and-load-preload-engines.patch Issue 1641 ftake@geeko.jp
+%if %{with_automatic_config}
 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
-# PATCH-FIX-UPSTREAM Always-save-the-content-type-cache-for-gnome-shell-p.patch bnc#847718
-Patch4:         Always-save-the-content-type-cache-for-gnome-shell-p.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         /usr/bin/touch
 Provides:       locale(ja;ko;zh)
@@ -189,7 +188,6 @@ rm -f data/dconf/00-upstream-settings
 %endif
 
 %patch3 -p1
-%patch4 -p1
 
 %build
 autoreconf -fi