- added ibus patch (fixes build with ibus 1.4)

- pl

diff --git a/ibus-fbterm-ibus.patch b/ibus-fbterm-ibus.patch
new file mode 100644 (file)
index 0000000..c5d299c
--- /dev/null
+++ b/ibus-fbterm-ibus.patch
@@ -0,0 +1,22 @@
+--- ibus-fbterm-0.9.1/src/display.c.orig       2009-11-22 02:00:00.000000000 +0100
++++ ibus-fbterm-0.9.1/src/display.c    2012-09-22 17:50:55.575504236 +0200
+@@ -212,7 +212,7 @@
+               IBusProperty *prop = ibus_prop_list_get(property_list, i);
+               if (!prop) break;
+ 
+-              w += text_width(prop->label->text);
++              w += text_width(ibus_property_get_label(prop)->text);
+       }
+ 
+       status_bar_win.x = cursor_x;
+@@ -238,8 +238,8 @@
+               IBusProperty *prop = ibus_prop_list_get(property_list, i);
+               if (!prop) break;
+ 
+-              draw_text(x, y, COLOR_FG, COLOR_BG, prop->label->text, strlen(prop->label->text));
+-              x += FW(text_width(prop->label->text));
++              draw_text(x, y, COLOR_FG, COLOR_BG, ibus_property_get_label(prop)->text, strlen(ibus_property_get_label(prop)->text));
++              x += FW(text_width(ibus_property_get_label(prop)->text));
+ 
+               char space = ' ';
+               draw_text(x, y, COLOR_FG, COLOR_BG, &space, 1);

diff --git a/ibus-fbterm.spec b/ibus-fbterm.spec
index 95ec5f72790905deaf4d535fdf0d49a66a4331c3..4cd591ce1ab39da4d1ee4b29b103acd3a2e88d79 100644 (file)
--- a/ibus-fbterm.spec
+++ b/ibus-fbterm.spec
@@ -1,24 +1,33 @@
 Summary:       IBus front-end for fbterm
+Summary(pl.UTF-8):     Interfejs platformy IBus dla fbterma
 Name:          ibus-fbterm
 Version:       0.9.1
-Release:       0.1
+Release:       1
 License:       GPL v3
 Group:         Applications/System
+#Source0Download: http://code.google.com/p/ibus-fbterm/downloads/list
 Source0:       http://ibus-fbterm.googlecode.com/files/%{name}-%{version}.tar.gz
 # Source0-md5: 966e4f275500979b78dd1303e96ca32d
 Patch0:                %{name}-uni-shell.patch
+Patch1:                %{name}-ibus.patch
 URL:           http://code.google.com/p/ibus-fbterm
-BuildRequires: ibus-devel >= 1.2
-Requires:      ibus >= 1.2
+BuildRequires: ibus-devel >= 1.2.0
+BuildRequires: pkgconfig
+Requires:      ibus >= 1.2.0
 Requires:      fbterm >= 1.6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-ibus-fbterm is a input method for FbTerm based on iBus.
+ibus-fbterm is a input method for FbTerm based on IBus.
+
+%description -l pl.UTF-8
+ibus-fbterm to oparta na platformie IBus metoda wprowadzania znaków
+dla FbTerma.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -36,6 +45,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS README
+%doc README
 %attr(755,root,root) %{_bindir}/ibus-fbterm
 %attr(755,root,root) %{_bindir}/ibus-fbterm-launch