SHA256
1
0
forked from pool/ibus

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
This commit is contained in:
Marguerite Su 2014-09-05 18:35:41 +00:00 committed by Git OBS Bridge
parent fc4f1659ed
commit c1e1041bf0
2 changed files with 15 additions and 1 deletions

View File

@ -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 Sun Aug 31 13:13:17 UTC 2014 - hillwood@linuxfans.org

View File

@ -17,7 +17,12 @@
%define gtk_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0) %define gtk_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0)
%if 0%{?suse_version} == 1315
%define with_python3 0 %define with_python3 0
%else
# temporary disable, 'coz ibus is not python3 ready
%define with_python3 0
%endif
%if 0%{?suse_version} > 1315 %if 0%{?suse_version} > 1315
%define with_wayland 1 %define with_wayland 1
%else %else
@ -107,7 +112,6 @@ Supplements: packageand(libreoffice:libreoffice-gnome)
Provides: locale(ja;ko;zh) Provides: locale(ja;ko;zh)
Obsoletes: ibus-gnome-shell Obsoletes: ibus-gnome-shell
Obsoletes: libibus-1_0-0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -118,6 +122,7 @@ developers to develop input method easily.
%package -n libibus-1_0-5 %package -n libibus-1_0-5
Summary: IBus libraries Summary: IBus libraries
Group: System/I18n/Chinese Group: System/I18n/Chinese
Obsoletes: libibus-1_0-0
%description -n libibus-1_0-5 %description -n libibus-1_0-5
This package contains the libraries for IBus This package contains the libraries for IBus
@ -156,6 +161,7 @@ Summary: Python3 module for ibus
Group: System/I18n/Chinese Group: System/I18n/Chinese
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: python3 Requires: python3
Obsoletes: python-ibus
%description -n python3-ibus %description -n python3-ibus
This package contains python3 module for ibus This package contains python3 module for ibus