commit e3f82c63c24a29c697c4d1712840fd1c5173834d
Author: Jakub Bogusz <[email protected]>
Date: Sun Apr 3 18:44:05 2016 +0200
- new URLs, updated to 1.0.1
- removed obsolete uni-shell,ibus patches
ibus-fbterm-ibus.patch | 51 ---------------------------------------------
ibus-fbterm-uni-shell.patch | 12 -----------
ibus-fbterm.spec | 31 +++++++++++++++------------
3 files changed, 18 insertions(+), 76 deletions(-)
---
diff --git a/ibus-fbterm.spec b/ibus-fbterm.spec
index 209986a..48f9b79 100644
--- a/ibus-fbterm.spec
+++ b/ibus-fbterm.spec
@@ -1,22 +1,26 @@
Summary: IBus front-end for fbterm
Summary(pl.UTF-8): Interfejs platformy IBus dla fbterma
Name: ibus-fbterm
-Version: 0.9.1
-Release: 4
+Version: 1.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.0
+#Source0Download: https://github.com/fujiwarat/ibus-fbterm/releases
+Source0:
https://github.com/fujiwarat/ibus-fbterm/releases/download/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 3ea4c7385567765b73002a48f98503f3
+URL: https://github.com/fujiwarat/ibus-fbterm
+BuildRequires: glib2-devel >= 1:2.32.0
+BuildRequires: ibus-devel >= 1.5.0
BuildRequires: pkgconfig
-Requires: ibus >= 1.2.0
+BuildRequires: sed >= 4.0
+BuildRequires: vala >= 2:0.20
+Requires: glib2 >= 1:2.32.0
+Requires: ibus >= 1.5.0
Requires: fbterm >= 1.6
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define _libexecdir %{_libdir}/ibus
+
%description
ibus-fbterm is a input method for FbTerm based on IBus.
@@ -26,8 +30,8 @@ dla FbTerma.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
+
+%{__sed} -i -e 's,/usr/libexec/,%{_libexecdir}/,g' ibus-fbterm
%build
%configure
@@ -47,4 +51,5 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc README
%attr(755,root,root) %{_bindir}/ibus-fbterm
-%attr(755,root,root) %{_bindir}/ibus-fbterm-launch
+%attr(755,root,root) %{_libexecdir}/ibus-fbterm-backend
+%{_mandir}/man1/ibus-fbterm.1*
diff --git a/ibus-fbterm-ibus.patch b/ibus-fbterm-ibus.patch
deleted file mode 100644
index ca06945..0000000
--- a/ibus-fbterm-ibus.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- ibus-fbterm-0.9.1/src/display.c.orig 2012-03-12 16:21:06.582175770
+0900
-+++ ibus-fbterm-0.9.1/src/display.c 2012-03-12 16:32:37.057787019 +0900
-@@ -212,7 +212,11 @@ static void calculate_status_win()
- IBusProperty *prop = ibus_prop_list_get(property_list, i);
- if (!prop) break;
-
-+#if IBUS_CHECK_VERSION (1, 4, 0)
-+ w += text_width(ibus_property_get_label(prop)->text);
-+#else
- w += text_width(prop->label->text);
-+#endif
- }
-
- status_bar_win.x = cursor_x;
-@@ -238,8 +242,16 @@ static void draw_status_bar()
- IBusProperty *prop = ibus_prop_list_get(property_list, i);
- if (!prop) break;
-
-+#if IBUS_CHECK_VERSION (1, 4, 0)
-+ IBusText *text = ibus_property_get_label(prop);
-+ draw_text(x, y, COLOR_FG, COLOR_BG,
-+ text->text,
-+ strlen(text->text));
-+ x += FW(text_width(text->text));
-+#else
- draw_text(x, y, COLOR_FG, COLOR_BG, prop->label->text,
strlen(prop->label->text));
- x += FW(text_width(prop->label->text));
-+#endif
-
- char space = ' ';
- draw_text(x, y, COLOR_FG, COLOR_BG, &space, 1);
---- ibus-fbterm-0.9.1/src/ibus-fbterm.c.orig 2012-03-13 19:47:33.036218019
+0900
-+++ ibus-fbterm-0.9.1/src/ibus-fbterm.c 2012-03-13 19:48:13.694187234
+0900
-@@ -119,13 +119,17 @@ static void im_active()
- debug("im active\n");
- modifier_state = 0;
- init_keycode_state();
-+#if ! IBUS_CHECK_VERSION (1, 4, 99)
- ibus_input_context_enable(ibus_ctx);
-+#endif
- }
-
- static void im_deactive()
- {
- debug("im deactive\n");
-+#if ! IBUS_CHECK_VERSION (1, 4, 99)
- ibus_input_context_disable(ibus_ctx);
-+#endif
-
- auxiliary_text_win.w = 0;
- lookup_table_win.w = 0;
diff --git a/ibus-fbterm-uni-shell.patch b/ibus-fbterm-uni-shell.patch
deleted file mode 100644
index 579a96d..0000000
--- a/ibus-fbterm-uni-shell.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ibus-fbterm-0.9.1/ibus-fbterm-launch.orig
ibus-fbterm-0.9.1/ibus-fbterm-launch
---- ibus-fbterm-0.9.1/ibus-fbterm-launch.orig 2010-01-22 16:29:03.542929160
+1000
-+++ ibus-fbterm-0.9.1/ibus-fbterm-launch 2010-01-22 16:29:43.456734687
+1000
-@@ -12,7 +12,7 @@ if [ ${#TTY} -eq ${#TTY_NUM} ]; then
- exit 1
- fi
-
--eval `dbus-launch --auto-syntax`
-+eval `dbus-launch --sh-syntax`
-
- export DISPLAY=:9${TTY_NUM}.0
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ibus-fbterm.git/commitdiff/e3f82c63c24a29c697c4d1712840fd1c5173834d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
