From c1e1041bf0e97339f247e4678376d4738b130d88db6b43be84fd69a77491b5a6 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Fri, 5 Sep 2014 18:35:41 +0000 Subject: [PATCH] Accepting request 247765 from home:MargueriteSu:branches:M17N OBS-URL: https://build.opensuse.org/request/show/247765 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=126 --- ibus.changes | 8 ++++++++ ibus.spec | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ibus.changes b/ibus.changes index 8c3544c..d28924b 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Sep 5 18:32:14 UTC 2014 - i@marguerite.su + +- properly disable python3 builds: + * ibus itself isn't python3 ready, its python module is totally + not usable under python3. +- move some Obsoletes to the correct sub-package. + ------------------------------------------------------------------- Sun Aug 31 13:13:17 UTC 2014 - hillwood@linuxfans.org diff --git a/ibus.spec b/ibus.spec index 9b91e72..45ac907 100644 --- a/ibus.spec +++ b/ibus.spec @@ -17,7 +17,12 @@ %define gtk_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0) +%if 0%{?suse_version} == 1315 %define with_python3 0 +%else +# temporary disable, 'coz ibus is not python3 ready +%define with_python3 0 +%endif %if 0%{?suse_version} > 1315 %define with_wayland 1 %else @@ -107,7 +112,6 @@ Supplements: packageand(libreoffice:libreoffice-gnome) Provides: locale(ja;ko;zh) Obsoletes: ibus-gnome-shell -Obsoletes: libibus-1_0-0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -118,6 +122,7 @@ developers to develop input method easily. %package -n libibus-1_0-5 Summary: IBus libraries Group: System/I18n/Chinese +Obsoletes: libibus-1_0-0 %description -n libibus-1_0-5 This package contains the libraries for IBus @@ -156,6 +161,7 @@ Summary: Python3 module for ibus Group: System/I18n/Chinese Requires: %{name} = %{version} Requires: python3 +Obsoletes: python-ibus %description -n python3-ibus This package contains python3 module for ibus