Accepting request 73463 from home:swyear:branches:M17N
- Update to ibus 1.3.9 - Set priority to 40, if we want to use ibus as default input method, better use a lower priority, so if any other input method framework installed, system can use other input method instead. - Update README - Remove kimpanel script from start up script - Add gtk3 immodule OBS-URL: https://build.opensuse.org/request/show/73463 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=14
This commit is contained in:
Git OBS Bridge
70
ibus.spec
70
ibus.spec
@@ -18,8 +18,8 @@
|
||||
|
||||
|
||||
Name: ibus
|
||||
Version: 1.3.8
|
||||
Release: 6
|
||||
Version: 1.3.9
|
||||
Release: 1
|
||||
License: LGPL V2+
|
||||
Url: http://code.google.com/p/ibus/
|
||||
Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
|
||||
@@ -27,8 +27,8 @@ Source1: xim.d-ibus
|
||||
Source2: ibus-README.suse
|
||||
Source3: xim.ibus.suse.template
|
||||
Patch0: ibus-python-install-dir.patch
|
||||
Patch1: ibus-disable-portability-check.patch
|
||||
Patch2: ibus-disable-introspect.patch
|
||||
#Patch1: ibus-disable-portability-check.patch
|
||||
#Patch2: ibus-disable-introspect.patch
|
||||
Group: System/I18n/Chinese
|
||||
Summary: Intelligent Input Bus for Linux OS
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@@ -40,10 +40,7 @@ BuildRequires: gettext-devel gtk-doc libtool python
|
||||
BuildRequires: dbus-1-devel dbus-1-glib-devel dbus-1-python-devel gtk2-devel
|
||||
BuildRequires: gconf2-devel python-gobject2-devel update-desktop-files
|
||||
BuildRequires: fdupes gobject-introspection-devel intltool iso-codes-devel
|
||||
%if %suse_version >= 1100
|
||||
BuildRequires: pcre-devel
|
||||
%endif
|
||||
Requires: glib2 python-gtk dbus-1-python notification-daemon iso-codes gconf2 python-xdg python-notify gobject-introspection
|
||||
Requires: python-gtk dbus-1-python notification-daemon iso-codes gconf2 python-xdg python-notify gobject-introspection
|
||||
%gconf_schemas_prereq
|
||||
|
||||
%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
|
||||
@@ -57,7 +54,7 @@ developers to develop input method easily.
|
||||
%package -n libibus2
|
||||
License: LGPL V2+
|
||||
Summary: IBus libraries
|
||||
Group: System Environment/Libraries
|
||||
Group: System/I18n/Chinese
|
||||
|
||||
%description -n libibus2
|
||||
This package contains the libraries for IBus
|
||||
@@ -65,17 +62,30 @@ This package contains the libraries for IBus
|
||||
%package gtk
|
||||
License: LGPL V2+
|
||||
Summary: IBus im module for gtk2
|
||||
Group: System Environment/Libraries
|
||||
Group: System/I18n/Chinese
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%gtk2_immodule_requires
|
||||
|
||||
%if %suse_version >= 1140
|
||||
%gtk3_immodule_requires
|
||||
%endif
|
||||
%description gtk
|
||||
This package contains ibus im module for gtk2
|
||||
|
||||
%if %suse_version >= 1140
|
||||
%package gtk3
|
||||
Summary: IBus im module for gtk3
|
||||
Group: System/I18n/Chinese
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildRequires: gtk3-devel
|
||||
|
||||
%description gtk3
|
||||
This package contains ibus im module for gtk3
|
||||
%endif
|
||||
|
||||
%package devel
|
||||
License: LGPL V2+
|
||||
Summary: Development tools for ibus
|
||||
Group: Development/Libraries
|
||||
Group: Development/Libraries/other
|
||||
Requires: libibus2 = %{version}-%{release}
|
||||
Requires: glib2-devel
|
||||
Requires: dbus-1-devel
|
||||
@@ -89,18 +99,26 @@ docs for ibus.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
#%patch1 -p1
|
||||
#%patch2 -p1
|
||||
|
||||
%build
|
||||
autoreconf -fi
|
||||
intltoolize -f
|
||||
%if %suse_version >= 1140
|
||||
%configure --disable-static \
|
||||
--disable-iso-codes-check \
|
||||
--disable-gobject-introspection \
|
||||
--enable-gtk-doc \
|
||||
--disable-qt4-immodule \
|
||||
--libexecdir=%{_prefix}/%{_lib}/ibus
|
||||
--libexecdir=%{_prefix}/%{_lib}/ibus \
|
||||
--enable-gtk3
|
||||
%else
|
||||
%configure --disable-static \
|
||||
--disable-iso-codes-check \
|
||||
--disable-gobject-introspection \
|
||||
--enable-gtk-doc \
|
||||
--libexecdir=%{_prefix}/%{_lib}/ibus
|
||||
%endif
|
||||
make %{?jobs:-j %jobs}
|
||||
|
||||
%install
|
||||
@@ -113,7 +131,7 @@ sed -i 1i"SYS_LIB=%{_lib}" $RPM_BUILD_ROOT/etc/X11/xim.d/ibus
|
||||
for lang in en zh_TW zh_HK zh_CN zh_SG ko_KR ja_JP ; do
|
||||
mkdir $lang
|
||||
pushd $lang
|
||||
ln -s ../ibus 10-ibus
|
||||
ln -s ../ibus 40-ibus
|
||||
popd
|
||||
done
|
||||
popd
|
||||
@@ -153,13 +171,21 @@ rm -rf %buildroot
|
||||
|
||||
%postun -n libibus2 -p /sbin/ldconfig
|
||||
|
||||
%if %suse_version >= 1140
|
||||
%post gtk3
|
||||
%gtk3_immodule_post
|
||||
|
||||
%postun gtk3
|
||||
%gtk3_immodule_postun
|
||||
%endif
|
||||
|
||||
%files -f %{name}.lst
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS COPYING README
|
||||
%doc $RPM_SOURCE_DIR/xim.ibus.suse.template
|
||||
%doc $RPM_SOURCE_DIR/ibus-README.suse
|
||||
%dir /etc/X11/xim.d
|
||||
/etc/X11/xim.d/*
|
||||
%config /etc/X11/xim.d/*
|
||||
%{python_sitelib}/ibus
|
||||
%dir %{_datadir}/ibus/
|
||||
%{_bindir}/ibus-daemon
|
||||
@@ -171,6 +197,8 @@ rm -rf %buildroot
|
||||
%{_prefix}/%{_lib}/ibus
|
||||
%dir %{_datadir}/vala
|
||||
%{_datadir}/vala/*
|
||||
%{_libdir}/girepository-1.0/IBus-1.0.typelib
|
||||
%{_datadir}/gir-1.0/IBus-1.0.gir
|
||||
|
||||
%files -n libibus2
|
||||
%defattr(-,root,root,-)
|
||||
@@ -180,6 +208,12 @@ rm -rf %buildroot
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.so
|
||||
|
||||
%if %suse_version >= 1140
|
||||
%files gtk3
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/gtk-3.0/3.0.0/immodules/*
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/lib*.so
|
||||
|
||||
Reference in New Issue
Block a user