Accepting request 81749 from home:ftake:branches:M17N

Fix problem IBus cannot save any settings on 12.1 by adding a new xim.d/ibus script that launch D-Bus daemon manually.

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

ibus.spec

@@ -17,6 +17,7 @@
 
 
 %define build_gtk3 (0%{suse_version} >= 1140)
+%define build_without_dbus_autolaunch (0%{suse_version} >= 1210)
 
 Name:           ibus
 Version:        1.3.9
@@ -26,7 +27,8 @@ Url:            http://code.google.com/p/ibus/
 Source0:        http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:        xim.d-ibus  
 Source2:        ibus-README.suse  
-Source3:        xim.ibus.suse.template 
+Source3:        xim.ibus.suse.template
+Source4:        xim.d-ibus-121
 Patch0:         ibus-python-install-dir.patch
 #Patch1:         ibus-disable-portability-check.patch
 #Patch2:         ibus-disable-introspect.patch
@@ -120,8 +122,12 @@ make %{?jobs:-j %jobs}
 
 %install
 %makeinstall
-mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/  
+mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/
+%if %{build_without_dbus_autolaunch}
+install -m 644 $RPM_SOURCE_DIR/xim.d-ibus-121 $RPM_BUILD_ROOT/etc/X11/xim.d/ibus
+%else
 install -m 644 $RPM_SOURCE_DIR/xim.d-ibus $RPM_BUILD_ROOT/etc/X11/xim.d/ibus
+%endif
 sed -i 1i"SYS_LIB=%{_lib}" $RPM_BUILD_ROOT/etc/X11/xim.d/ibus
 
 PRIORITY=40