Accepting request 243221 from home:ftake:branches:M17N

- remove patches merged by upstream
  * add-libgnomekbd-and-load-preload-engines.patch
  * reload-preload-engines-until-users-customize-the-list.patch
- obsoletes python-ibus when packaged for Python 3

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

ibus.spec

@@ -16,7 +16,6 @@
 #
 
 
-%define with_automatic_config 1
 %define gtk_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-2.0)
 %define with_python3 1
 %if 0%{?suse_version} >= 1310
@@ -43,14 +42,6 @@ Source7:        macros.ibus
 Source99:       baselibs.conf
 # PATCH-FIX-OPENSUSE ibus-python-install-dir.patch ftake@geeko.jp
 Patch0:         ibus-python-install-dir.patch
-
-%if %{with_automatic_config}
-# 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
 # PATFH-FIX-SUSE ibus-xim-fix-re-focus-after-lock.patch bnc#874869 tiwa@suse.de -- Fix lost XIM input after screenlock
@@ -66,10 +57,6 @@ Patch5:         ibus-force-python3.patch
 Patch6:         ibus-vala-0.18.patch
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  dbus-1-python-devel >= 0.83.0
-%if %{with_automatic_config}
-BuildRequires:  dbus-1-x11
-BuildRequires:  libgnomekbd-devel
-%endif
 BuildRequires:  dconf-devel >= 0.7.5
 BuildRequires:  fdupes
 BuildRequires:  gconf2-devel
@@ -121,6 +108,9 @@ Supplements:    packageand(libreoffice:libreoffice-gnome)
 Provides:       locale(ja;ko;zh)
 Obsoletes:      ibus-gnome-shell
 Obsoletes:      libibus-1_0-0
+%if %{with_python3}
+Obsoletes:      python-ibus
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -229,13 +219,6 @@ sed -i \
     %{SOURCE99}
 %endif
 
-%if %{with_automatic_config}
-#%patch1 -p1
-#%patch2 -p1
-rm -f bindings/vala/ibus-1.0.vapi
-rm -f data/dconf/00-upstream-settings
-%endif
-
 %patch3 -p1
 %patch4 -p1
 
@@ -262,17 +245,10 @@ intltoolize -f
            --enable-gtk-doc \
 %if %{with_wayland}
            --enable-wayland \
-%endif
-%if %{with_automatic_config}
-           --enable-libgnomekbd \
 %endif
            --enable-surrounding-text \
            --libexecdir=%{_libdir}/ibus
 
-%if %{with_automatic_config}
-make -C ui/gtk3 maintainer-clean-generic %{?_smp_mflags}
-%endif
-
 make %{?_smp_mflags}
 
 %install