[Fedora-i18n-bugs] [eekboard/f14] Update to 1.0.3-1.

Fri Sep 2 03:55:15 UTC 2011

commit 9f1c3d7b2ef1dbb11e070e13edfee7841888389a
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Fri Sep 2 12:54:58 2011 +0900

    Update to 1.0.3-1.

 .gitignore       |    1 +
 eekboard.desktop |    9 -----
 eekboard.spec    |  106 ++++++++++++++++++++++++++++++++++++++++++++----------
 sources          |    2 +-
 4 files changed, 89 insertions(+), 29 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index fa7fc46..6fd25ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ eekboard-0.0.5.tar.gz
 /eekboard-0.90.2.tar.gz
 /eekboard-0.90.3.tar.gz
 /eekboard-0.90.4.tar.gz
+/eekboard-1.0.3.tar.gz
diff --git a/eekboard.spec b/eekboard.spec
index 6092171..8c676ee 100644
--- a/eekboard.spec
+++ b/eekboard.spec
@@ -1,29 +1,34 @@
 Name:		eekboard
-Version:	0.90.4
+Version:	1.0.3
 Release:	1%{?dist}
 Summary:	An Easy-to-use Virtual Keyboard Toolkit
 
 Group:		Applications/System
 License:	GPLv3+
-URL:		http://ueno.github.com/eekboard/
+URL:		http://fedorahosted.org/eekboard/
 Source0:	http://github.com/downloads/ueno/eekboard/eekboard-%{version}.tar.gz
-Source1:	%{name}.desktop
 BuildRequires:	libfakekey-devel
+# older libfakekey-devel has missing BR: libXtst-devel (#680878)
 BuildRequires:	libXtst-devel
-#BuildRequires:	clutter-gtk-devel
-BuildRequires:  gtk2-devel
+# clutter build is currently disabled
+# BuildRequires:	clutter-gtk-devel
+BuildRequires:	gtk3-devel
 BuildRequires:	libxklavier-devel
-BuildRequires:  GConf2-devel
-BuildRequires:  at-spi-devel
+BuildRequires:	at-spi2-core-devel
+# at-spi2-core-devel has missing BR: dbus-glib-devel
+BuildRequires:	dbus-glib-devel
 %if (0%{?fedora} <= 13)
 BuildRequires:	gir-repository-devel
 %endif
 BuildRequires:	intltool desktop-file-utils
-BuildRequires:  gobject-introspection-devel
-BuildRequires:  python2-devel
-BuildRequires:  libcroco-devel
+BuildRequires:	gobject-introspection-devel
+BuildRequires:	python2-devel
+BuildRequires:	libcroco-devel
+BuildRequires:	ibus-devel
+BuildRequires:	vala-tools
 
-Requires: eekboard-libs = %{version}-%{release}
+# eekboard-python is required for eekxml tool.
+Requires: eekboard-python = %{version}-%{release}
 
 %description
 eekboard is a virtual keyboard software package, including a set of
@@ -44,7 +49,6 @@ License:	LGPLv2+ and GFDL
 
 Requires:	vala
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	gtk-doc
 
 %description devel
 This package contains the development tools for eekboard.
@@ -63,16 +67,24 @@ This package contains the Python language binding of eekboard client library.
 
 
 %build
-%configure --disable-static --with-gtk=2.0
+%configure --disable-static --with-gtk=3.0 --enable-atspi
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
-desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
-%{SOURCE1}
+
+# 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}
 
@@ -84,9 +96,13 @@ if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
+if [ $1 -eq 0 ] ; then
+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
@@ -94,15 +110,16 @@ 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-desktop-client
-%{_bindir}/eekboard-client
-%{_bindir}/eekboard-xml
+%{_bindir}/eekboard
+%{_bindir}/eekxml
 %{_datadir}/dbus-1/services/eekboard-server.service
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/eekboard.png
 %{_datadir}/icons/hicolor/scalable/apps/eekboard.svg
 %{_datadir}/eekboard/
+%{_datadir}/glib-2.0/schemas/*
 
 %files libs
 %defattr(-,root,root,-)
@@ -124,10 +141,61 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files python
 %defattr(-,root,root,-)
+%doc python-installed/examples
 %{python_sitelib}/eekboard/
 
 
 %changelog
+* Thu Sep  1 2011 Daiki Ueno <dueno at redhat.com> - 1.0.3-1
+- new upstream release
+
+* Fri Aug 26 2011 Daiki Ueno <dueno at redhat.com> - 1.0.2-3
+- 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
+- add eekboard-python-binding-fix.patch
+
+* Thu Aug 25 2011 Daiki Ueno <dueno at redhat.com> - 1.0.2-1
+- new upstream release
+
+* Mon Aug 15 2011 Daiki Ueno <dueno at redhat.com> - 1.0.1-2
+- add eekboard-key-repeat.patch
+
+* Mon Aug 15 2011 Daiki Ueno <dueno at redhat.com> - 1.0.1-1
+- new upstream release
+
+* Fri Aug 12 2011 Daiki Ueno <dueno at redhat.com> - 1.0.0-1
+- new upstream release
+
+* Thu May 26 2011 Daiki Ueno <dueno at redhat.com> - 0.90.7-2
+- remove runtime dependency on gtk-doc (#707551)
+- let the base package depend on eekboard-python instead of
+  eekboard-libs, for eekboard-inscript
+
+* Fri Apr 22 2011 Daiki Ueno <dueno at redhat.com> - 0.90.7-1
+- new upstream release
+- link against at-spi2-core
+- install eekboard-autostart.desktop
+
+* Tue Apr 19 2011 Daiki Ueno <dueno at redhat.com> - 0.90.6-3
+- don't link against CSPI-1.0 (fixes #697546)
+
+* Fri Apr 15 2011 Daiki Ueno <dueno at redhat.com> - 0.90.6-2
+- apply a patch to fix Exec in desktop file
+
+* Fri Mar 11 2011 Daiki Ueno <dueno at redhat.com> - 0.90.6-1
+- new upstream release
+
+* Fri Mar 11 2011 Daiki Ueno <dueno at redhat.com> - 0.90.5-2
+- apply a patch to support newer pygobject2
+
+* Fri Mar 11 2011 Daiki Ueno <dueno at redhat.com> - 0.90.5-1
+- new upstream release
+
+* Tue Mar  8 2011 Daiki Ueno <dueno at redhat.com> - 0.90.4-2
+- add eekboard-annotation.patch needed by newer pygobject2
+
 * Tue Mar  8 2011 Daiki Ueno <dueno at redhat.com> - 0.90.4-1
 - new upstream release
 
diff --git a/sources b/sources
index d46594f..5eab388 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5755f4efd4c726a415db47ea2ac41868  eekboard-0.90.4.tar.gz
+313cf7f1ae633656503b9f86c2f7a431  eekboard-1.0.3.tar.gz
