[Fedora-i18n-bugs] [eekboard/f16] Update to 1.0.7-2.

Fri May 11 07:43:06 UTC 2012

commit 53ca66a8d74d7e8be80c57da29d16e63656c9e75
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Fri May 11 16:42:40 2012 +0900

    Update to 1.0.7-2.

 .gitignore               |    1 +
 eekboard-fix-crash.patch |   27 +++++++++++++++++++
 eekboard.spec            |   65 ++++++++++++++++++++++------------------------
 sources                  |    2 +-
 4 files changed, 60 insertions(+), 35 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 90e764a..08fc520 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ eekboard-0.0.5.tar.gz
 /eekboard-1.0.3.tar.gz
 /eekboard-1.0.4.tar.gz
 /eekboard-1.0.5.tar.gz
+/eekboard-1.0.7.tar.gz
diff --git a/eekboard-fix-crash.patch b/eekboard-fix-crash.patch
new file mode 100644
index 0000000..75b811a
--- /dev/null
+++ b/eekboard-fix-crash.patch
@@ -0,0 +1,27 @@
+From 4df2ecc8ae08872614dc7c250f8df0aa7ea20938 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno at unixuser.org>
+Date: Mon, 16 Apr 2012 14:37:18 +0900
+Subject: [PATCH] Don't abort when failed to load keyboard.
+
+---
+ src/client.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/client.c b/src/client.c
+index d85c87a..ee0c577 100644
+--- a/src/client.c
++++ b/src/client.c
+@@ -779,8 +779,8 @@ set_keyboards (Client              *client,
+     for (p = keyboards; *p != NULL; p++) {
+         keyboard_id = eekboard_context_add_keyboard (client->context, *p, NULL);
+         if (keyboard_id == 0) {
+-            g_slist_free (head);
+-            return FALSE;
++            g_warning ("can't add keyboard %s", *p);
++            continue;
+         }
+         client->keyboards = g_slist_prepend (client->keyboards,
+                                              GUINT_TO_POINTER(keyboard_id));
+-- 
+1.7.7.6
+
diff --git a/eekboard.spec b/eekboard.spec
index 38da634..80f4e39 100644
--- a/eekboard.spec
+++ b/eekboard.spec
@@ -1,31 +1,24 @@
 Name:		eekboard
-Version:	1.0.5
+Version:	1.0.7
 Release:	2%{?dist}
-Summary:	An Easy-to-use Virtual Keyboard Toolkit
+Summary:	Yet Another Virtual Keyboard
 
 Group:		Applications/System
 License:	GPLv3+
 URL:		http://fedorahosted.org/eekboard/
 Source0:	http://github.com/downloads/ueno/eekboard/eekboard-%{version}.tar.gz
-BuildRequires:	libfakekey-devel
-# older libfakekey-devel has missing BR: libXtst-devel (#680878)
+Patch0:		eekboard-fix-crash.patch
 BuildRequires:	libXtst-devel
-# clutter build is currently disabled
-# BuildRequires:	clutter-gtk-devel
 BuildRequires:	gtk3-devel
 BuildRequires:	libxklavier-devel
 BuildRequires:	at-spi2-core-devel
-# at-spi2-core-devel has missing BR: dbus-glib-devel
-BuildRequires:	dbus-glib-devel
 BuildRequires:	intltool desktop-file-utils
 BuildRequires:	gobject-introspection-devel
-BuildRequires:	python2-devel
 BuildRequires:	libcroco-devel
-BuildRequires:	ibus-devel
 BuildRequires:	vala-tools
 
-# eekboard-python is required for eekxml tool.
-Requires: eekboard-python = %{version}-%{release}
+Provides:	eekboard-python = %{version}-%{release}
+Obsoletes:	eekboard-python < 1.0.5-5
 
 %description
 eekboard is a virtual keyboard software package, including a set of
@@ -50,21 +43,14 @@ Requires:	%{name}-libs = %{version}-%{release}
 %description devel
 This package contains the development tools for eekboard.
 
-%package python
-Summary:	Python binding of eekboard client library
-Group:		System Environment/Libraries
-Requires:	%{name} = %{version}-%{release}
-
-%description python
-This package contains the Python language binding of eekboard client library.
-
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-crash
 
 
 %build
-%configure --disable-static --with-gtk=3.0 --enable-atspi
+%configure --disable-static --enable-atspi
 make %{?_smp_mflags}
 
 
@@ -77,10 +63,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 mkdir -p base-installed/examples
 mv $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop base-installed/examples
 
-# Install Python examples under doc.
-mkdir -p python-installed/examples
-cp examples/simple-client/simple-client python-installed/examples
-
 desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 %find_lang %{name}
@@ -106,11 +88,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc base-installed/examples
 %{_bindir}/eekboard-server
 %{_bindir}/eekboard
-%{_bindir}/eekxml
+%{_libexecdir}/eekboard-setup
 %{_datadir}/dbus-1/services/eekboard-server.service
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/eekboard.png
@@ -119,30 +100,46 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/glib-2.0/schemas/*
 
 %files libs
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_libdir}/libeek*.so.*
 %{_libdir}/girepository-1.0/Eek*.typelib
 
 %files devel
-%defattr(-,root,root,-)
 # LGPLv2+
 %{_libdir}/libeek*.so
 %{_includedir}/eek-0.90/
 %{_includedir}/eekboard-0.90/
 %{_datadir}/gir-1.0/Eek*.gir
 %{_datadir}/vala/vapi/eek*.vapi
+%{_datadir}/vala/vapi/eek*.deps
 %{_libdir}/pkgconfig/eek*.pc
 # GFDL
 %{_datadir}/gtk-doc/html/*
 
-%files python
-%defattr(-,root,root,-)
-%doc python-installed/examples
-%{python_sitelib}/eekboard/
-
 
 %changelog
+* Tue Apr 17 2012 Daiki Ueno <dueno at redhat.com> - 1.0.7-2
+- remove unnecessary BR: dbus-glib-devel
+- add eekboard-fix-crash.patch
+
+* Fri Apr 13 2012 Daiki Ueno <dueno at redhat.com> - 1.0.7-1
+- new upstream release
+- drop unnecessary %%defattr(-,root,root,-) from %%files
+
+* Sat Mar 31 2012 Daiki Ueno <dueno at redhat.com> - 1.0.6-2
+- add provides/obsoletes for -python subpackage (fixes #808634)
+
+* Fri Mar 30 2012 Daiki Ueno <dueno at redhat.com> - 1.0.6-1
+- new upstream release
+- drop IBus dependency
+- drop Python binding
+
+* Tue Mar  6 2012 Takao Fujiwara <tfujiwar at redhat.com> - 1.0.5-4
+- Rebuild for ibus 1.4.99.20120304
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Tue Dec  6 2011 Daiki Ueno <dueno at redhat.com> - 1.0.5-2
 - drop gir-repository-devel from conditional BR
 
diff --git a/sources b/sources
index 28e2707..9899bee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17ed7891724e07af2acf4b71c2145e2e  eekboard-1.0.5.tar.gz
+905baf1e5f49fbdfd7ddce898927c821  eekboard-1.0.7.tar.gz
