[Fedora-i18n-bugs] [eekboard/f16] Don't install eekboard-autostart.desktop to avoid conflict with other OSK.

[Daiki Ueno]

commit d2be1cb72db1132c741a1ea89f61837680b6235b
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Fri Aug 26 10:42:37 2011 +0900

    Don't install eekboard-autostart.desktop to avoid conflict with other OSK.

 eekboard.spec |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/eekboard.spec b/eekboard.spec
index b89485b..8e46b5b 100644
--- a/eekboard.spec
+++ b/eekboard.spec
@@ -1,6 +1,6 @@
 Name:		eekboard
 Version:	1.0.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	An Easy-to-use Virtual Keyboard Toolkit
 
 Group:		Applications/System
@@ -27,8 +27,8 @@ BuildRequires:	libcroco-devel
 BuildRequires:	ibus-devel
 BuildRequires:	vala-tools
 
+# eekboard-python is required for eekxml tool.
 Requires: eekboard-python = %{version}-%{release}
-Requires: python-virtkey
 
 %description
 eekboard is a virtual keyboard software package, including a set of
@@ -74,6 +74,16 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+
+# We don't install autostart file to avoid conflict with other OSK.
+# Instead, install it under doc.
+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}
@@ -100,12 +110,12 @@ 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
 %{_datadir}/dbus-1/services/eekboard-server.service
 %{_datadir}/applications/%{name}.desktop
-%{_sysconfdir}/xdg/autostart/%{name}-autostart.desktop
 %{_datadir}/icons/hicolor/*/apps/eekboard.png
 %{_datadir}/icons/hicolor/scalable/apps/eekboard.svg
 %{_datadir}/eekboard/
@@ -131,10 +141,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files python
 %defattr(-,root,root,-)
+%doc python-installed/examples
 %{python_sitelib}/eekboard/
 
 
 %changelog
+* Fri Aug 26 2011 Daiki Ueno <dueno at redhat.com> - 1.0.2-2
+- install eekboard-autostart.desktop under %%doc/examples instead of
+  the autostart dir to avoid conflict with other at-spi based OSK
+- install simple-client under %%doc/examples
+- remove unnecessary dependency on python-virtkey
+
 * Thu Aug 25 2011 Daiki Ueno <dueno at redhat.com> - 1.0.2-1
 - new upstream release