|
@@ -1,7 +1,7 @@
|
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
|
|
|
%define ver 1.4.99.20121006
|
|
|
-%define rel 1
|
|
|
+%define rel 2
|
|
|
|
|
|
%define gjsver 3.4.1.20120815
|
|
|
|
|
@@ -25,8 +25,8 @@ URL: http://code.google.com/p/ibus/
|
|
|
|
|
|
Source0: %{name}-%{version}.tar.gz
|
|
|
Source1: http://fujiwara.fedorapeople.org/ibus/gnome-shell/ibus-gjs-%{gjsver}.tar.gz
|
|
|
-Source2: xinput-ibus
|
|
|
|
|
|
+Patch0: ibus-HEAD.patch
|
|
|
Patch1: ibus-810211-no-switch-by-no-trigger.patch
|
|
|
Patch2: ibus-541492-xkb.patch
|
|
|
Patch3: ibus-530711-preload-sys.patch
|
|
@@ -71,8 +71,6 @@ Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
Packager: iwaim
|
|
|
|
|
|
-%define _xinputconf %{_sysconfdir}/X11/xinit/xinput.d/ibus.conf
|
|
|
-
|
|
|
%description
|
|
|
IBus is an Intelligent Input Bus. It is a new input framework for Linux OS.
|
|
|
It provides full featured and user friendly input method user interface.
|
|
@@ -141,7 +139,7 @@ The compat32-ibus-gtk3 contains ibus im module for gtk3.
|
|
|
zcat %SOURCE1 | tar xf -
|
|
|
%endif
|
|
|
|
|
|
-# %patch0 -p1
|
|
|
+%patch0 -p1
|
|
|
%patch1 -p1 -b .noswitch
|
|
|
%if %have_libxkbfile
|
|
|
%patch2 -p1 -b .xkb
|
|
@@ -203,9 +201,6 @@ rm -rf %{buildroot}%{_libdir}/libibus-%{ibus_api_version}.la
|
|
|
rm -rf %{buildroot}%{_libdir}/gtk-2.0/immodules/im-ibus.la
|
|
|
rm -rf %{buildroot}%{_libdir}/gtk-3.0/3.0.0/immodules/im-ibus.la
|
|
|
|
|
|
-# install xinput config file
|
|
|
-install -pm 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_xinputconf}
|
|
|
-
|
|
|
%{_bindir}/desktop-file-install \
|
|
|
--vendor="" --dir=%{buildroot}/%{_datadir}/applications \
|
|
|
--add-category=Applications \
|
|
@@ -300,7 +295,6 @@ dconf update
|
|
|
%{_libexecdir}/ibus-dconf
|
|
|
%{_libexecdir}/ibus-engine-simple
|
|
|
%{_libexecdir}/ibus-ui-gtk3
|
|
|
-#%{python_sitearch}/ibus
|
|
|
%{python_sitelib}/ibus
|
|
|
%{_datadir}/GConf/gsettings/ibus.convert
|
|
|
%{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml
|
|
@@ -310,7 +304,6 @@ dconf update
|
|
|
%{_sysconfdir}/bash_completion.d/ibus.bash
|
|
|
%{_sysconfdir}/dconf/db/ibus.d/00-upstream-settings
|
|
|
%{_sysconfdir}/dconf/profile/ibus
|
|
|
-%config %{_xinputconf}
|
|
|
%if %have_libxkbfile
|
|
|
%{_libexecdir}/ibus-xkb
|
|
|
%endif
|
|
@@ -350,6 +343,11 @@ dconf update
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Oct 17 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.99.20121006-2
|
|
|
+- update Patch2 (ibus-541492-xkb.patch)
|
|
|
+- add Patch0 (ibus-HEAD.patch) from fedora
|
|
|
+- remove SOURCE2
|
|
|
+
|
|
|
* Sat Sep 29 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.99.20121006-1
|
|
|
- update to ibus-1.4.99.20121006-1
|
|
|
- update following source and patches from fedora
|