[autokey] Update to 0.90.4

[Raghu Udiyar]

commit 742cb8a76552a6764a7fdee8d5dac8be0803bdd4
Author: Raghu Udiyar <raghusiddarth at gmail.com>
Date:   Thu May 17 11:54:40 2012 +0530

    Update to 0.90.4

 .gitignore   |    1 +
 autokey.spec |  112 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 sources      |    2 +-
 3 files changed, 98 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f758923..f1305d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /autokey_0.80.3.tar.gz
 /autokey_0.81.0.tar.gz
 /autokey_0.81.4.tar.gz
+/autokey-0.90.4.tar.gz
diff --git a/autokey.spec b/autokey.spec
index 0d4989a..82ba98b 100644
--- a/autokey.spec
+++ b/autokey.spec
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:		autokey
-Version:	0.81.4
+Version:	0.90.4
 Release:	1%{?dist}
 Summary:	Desktop automation utility 
 
@@ -10,7 +10,7 @@ Summary:	Desktop automation utility
 Group:		Applications/Productivity
 License:	GPLv3
 URL:		http://autokey.googlecode.com
-Source0:	http://autokey.googlecode.com/files/%{name}_%{version}.tar.gz 
+Source0:	http://autokey.googlecode.com/files/%{name}-%{version}.tar.gz 
 
 
 BuildArch:	noarch 
@@ -29,6 +29,45 @@ and hot keys. It offers a full-featured GUI that makes it highly
 accessible for novices, as well as a scripting interface offering 
 the full flexibility and power of the Python language.
 
+%package common
+Summary:	Desktop automation utility - common data	
+Group:		Applications/Productivity
+Requires:	python-simplejson
+Requires:	python-inotify
+Requires:	python-xlib
+Requires:	wmctrl
+Provides:	autokey = %{version}-%{release}
+
+
+%description common
+This package contains the common data shared between the various front ends.
+
+
+%package gtk
+Summary:	AutoKey GTK+ front end
+Group:		Applications/Productivity
+Requires:	pygtksourceview
+Requires:	pygtk2
+Requires:	notify-python
+Requires:	zenity
+Requires:	autokey-common = %{version}-%{release}
+Provides:	autokey = %{version}-%{release}
+%description gtk
+This package contains the GTK+ front end for autokey
+
+
+%package qt
+Summary:	AutoKey QT front end
+Group:		Applications/Productivity
+Requires:	qscintilla-python
+Requires:	PyKDE4
+Requires:	notify-python
+Requires:	autokey-common = %{version}-%{release}
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
+Provides:	autokey = %{version}-%{release}
+%description qt
+This package contains the QT front end for autokey
+
 
 %prep
 %setup -q
@@ -42,8 +81,6 @@ the full flexibility and power of the Python language.
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
-desktop-file-validate %{buildroot}/%{_datadir}/applications/autokey-gtk.desktop
-
 # remove shebang from python libraries
 for lib in $(find %{buildroot}%{python_sitelib}/autokey/ -name "*.py"); do
  sed '/\/usr\/bin\/env/d' $lib > $lib.new &&
@@ -51,29 +88,72 @@ for lib in $(find %{buildroot}%{python_sitelib}/autokey/ -name "*.py"); do
  mv $lib.new $lib
 done
 
+%post gtk
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun gtk
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans gtk
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 
-%post
-update-desktop-database > /dev/null 2>&1 || :
+%post qt
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
+%postun qt
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+fi
 
-%postun
-update-desktop-database > /dev/null 2>&1 || :
+%posttrans qt
+/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 
 
-%files
-%doc doc/scripting ACKNOWLEDGMENTS COPYING
-# For noarch packages: sitelib
-%{python_sitelib}/autokey/*
+%files common
+%defattr(-,root,root)
+%doc ACKNOWLEDGMENTS README
+%dir %{python_sitelib}/autokey
+%{python_sitelib}/autokey/*.py*
+%exclude %{python_sitelib}/autokey/gtkapp.py*
 %{python_sitelib}/autokey-*.egg-info
-%{_bindir}/autokey-gtk
+%{_datadir}/icons/hicolor/scalable/apps/autokey-status*.svg
+%{_datadir}/icons/hicolor/scalable/apps/autokey.png
+%{_datadir}/icons/ubuntu-mono-dark/apps/*
+%{_datadir}/icons/ubuntu-mono-light/apps/*
+%{_datadir}/icons/Humanity/scalable/apps/*.svg
 %{_bindir}/autokey-run
+%{_mandir}/man1/autokey-run.1*
+
+%files gtk
+%defattr(-,root,root)
+%{_bindir}/autokey-gtk
+%{python_sitelib}/autokey/gtkapp.py*
+%{python_sitelib}/autokey/gtkui/
 %{_datadir}/applications/autokey-gtk.desktop
-%{_datadir}/pixmaps/*
-%{_mandir}/man1/autokey-gtk.1.gz
-%{_mandir}/man1/autokey-run.1.gz
+%{_datadir}/icons/hicolor/scalable/apps/autokey.svg
+%{_mandir}/man1/autokey-gtk.1*
+
+%files qt
+%defattr(-,root,root)
+%{_bindir}/autokey-qt
+%{python_sitelib}/autokey/qtapp.py*
+%{python_sitelib}/autokey/qtui/
+%{_datadir}/kde4/apps/autokey/autokeyui.rc
+%{_datadir}/applications/autokey-qt.desktop
+%{_datadir}/icons/hicolor/scalable/apps/autokey.png
+%{_mandir}/man1/autokey-qt.1*
 
 
 %changelog
+* Thu May 17 2012 Raghu Udiyar <raghusiddarth at gmail.com> 0.90.4-1
+- Update to upstream 0.90-4 release
+- Qt interface is back with major updates to both frontends
+- Back to the old split package structure
+
 * Tue Jan 10 2012 Matěj Cepl <mcepl at redhat.com> 0.81.4-1
 - Upgrade to the latest upstream package.
 
diff --git a/sources b/sources
index 3e9ff0e..71ac837 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7807258d451fba7094dc59ba5f5c0147  autokey_0.81.4.tar.gz
+c2a74ddc2cb06c9798b7fa57fd65019a  autokey-0.90.4.tar.gz