diff --git a/.gitignore b/.gitignore index f1305d3..56832a9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /autokey_0.81.0.tar.gz /autokey_0.81.4.tar.gz /autokey-0.90.4.tar.gz +/v0.94.0.tar.gz diff --git a/autokey.spec b/autokey.spec index acf7714..ecbbcc3 100644 --- a/autokey.spec +++ b/autokey.spec @@ -1,20 +1,17 @@ -# sitelib for noarch packages -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} - Name: autokey -Version: 0.90.4 -Release: 14%{?dist} +Version: 0.94.0 +Release: 1%{?dist} Summary: Desktop automation utility Group: Applications/Productivity License: GPLv3 -URL: http://autokey.googlecode.com -Source0: http://autokey.googlecode.com/files/%{name}-%{version}.tar.gz +URL: https://github.com/autokey/autokey +Source0: https://github.com/autokey/autokey/archive/v%{version}.tar.gz BuildArch: noarch -BuildRequires: python-xlib,notify-python,pygtk2,pygtk2-libglade,desktop-file-utils +BuildRequires: python3-devel,python3-xlib,python3-inotify,python3-dbus,python3-setuptools %description @@ -27,9 +24,9 @@ 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: python3-dbus +Requires: %{py3_dist pyinotify} +Requires: %{py3_dist python-xlib} Requires: wmctrl Provides: autokey = %{version}-%{release} @@ -41,10 +38,9 @@ This package contains the common data shared between the various front ends. %package gtk Summary: AutoKey GTK+ front end Group: Applications/Productivity -Requires: gtksourceview3 -Requires: notify-python -Requires: python2-dbus -Requires: python2-gobject-base +Requires: libappindicator-gtk3 +Requires: pygtksourceview +Requires: python3-gobject Requires: zenity Requires: autokey-common = %{version}-%{release} Provides: autokey = %{version}-%{release} @@ -55,9 +51,9 @@ 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: python3-qscintilla +Requires: python3-PyQt4 +Requires: python3-pykde4 Requires: autokey-common = %{version}-%{release} %{?_qt4_version:Requires: qt4 >= %{_qt4_version}} Provides: autokey = %{version}-%{release} @@ -66,61 +62,63 @@ This package contains the QT front end for autokey %prep -%setup -q +%setup -q -n %{name}-%{version} %build -%{__python} setup.py build +%{__python3} setup.py build %install rm -rf %{buildroot} -%{__python} setup.py install -O1 --skip-build --root %{buildroot} +%{__python3} setup.py install -O1 --skip-build --root %{buildroot} --prefix %{_prefix} # remove shebang from python libraries -for lib in $(find %{buildroot}%{python_sitelib}/autokey/ -name "*.py"); do +for lib in $(find %{buildroot}%{python3_sitelib}/autokey/ -name "*.py"); do sed '/\/usr\/bin\/env/d' $lib > $lib.new && touch -r $lib $lib.new && mv $lib.new $lib done +# ensure pkg_resources is able to find the required python packages +sed -i 's/dbus-python/pydbus/' %{buildroot}%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info/requires.txt +sed -i 's/python3-xlib/python-xlib/' %{buildroot}%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info/requires.txt %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 -%{_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 +%doc ACKNOWLEDGMENTS README.rst new_features.rst CHANGELOG.rst +%{python3_sitelib}/* +%exclude %{python3_sitelib}/autokey/gtkapp.py* +%exclude %{python3_sitelib}/autokey/gtkui/* +%exclude %{python3_sitelib}/autokey/qtapp.py* +%exclude %{python3_sitelib}/autokey/qtui/* +%{_datadir}/icons/* %{_bindir}/autokey-run +%{_bindir}/autokey-shell %{_mandir}/man1/autokey-run.1* %files gtk %defattr(-,root,root) %{_bindir}/autokey-gtk -%{python_sitelib}/autokey/gtkapp.py* -%{python_sitelib}/autokey/gtkui/ +%{python3_sitelib}/autokey/gtkapp.py* +%{python3_sitelib}/autokey/gtkui/* %{_datadir}/applications/autokey-gtk.desktop -%{_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/ +%{python3_sitelib}/autokey/qtapp.py* +%{python3_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 +* Tue May 01 2018 Raghu Udiyar - 0.94.0-1 +- Update to latest 0.94.0 and use python3 (#1567688) + * Wed Apr 04 2018 Kalev Lember - 0.90.4-14 - Add missing dependencies for autokey-gtk (#1520592) @@ -169,10 +167,10 @@ done * Tue Jan 10 2012 Matěj Cepl 0.81.4-1 - Upgrade to the latest upstream package. -* Wed Nov 22 2011 Raghu Udiyar 0.81.0-2 +* Tue Nov 22 2011 Raghu Udiyar 0.81.0-2 - Add autokey-run files to the package -* Wed Nov 22 2011 Raghu Udiyar 0.81.0-1 +* Tue Nov 22 2011 Raghu Udiyar 0.81.0-1 - Update to upstream 0.81.0 release - Changelog : http://code.google.com/p/autokey/source/browse/trunk/debian/changelog?r=408 @@ -214,7 +212,7 @@ done * Fri Mar 04 2011 Raghu Udiyar 0.71.2-4 - Remove deprecated daemon, see : http://code.google.com/p/autokey/issues/detail?id=106 -* Wed Feb 28 2011 Raghu Udiyar 0.71.2-3 +* Mon Feb 28 2011 Raghu Udiyar 0.71.2-3 - Add script to remove shebang from python libraries - Remove default start from initscript - Add patch to use lockfile in initscript @@ -223,7 +221,7 @@ done - Add postun scriptlet to handle upgrades - Set autokey service to start only in runlevel 5 -* Sat Jan 30 2011 Raghu Udiyar 0.71.2-1 +* Sun Jan 30 2011 Raghu Udiyar 0.71.2-1 - Update to upstream 0.71.2 release - Add COPYING file to docs - Update init script to match upstream diff --git a/sources b/sources index 71ac837..a1db3c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c2a74ddc2cb06c9798b7fa57fd65019a autokey-0.90.4.tar.gz +SHA512 (v0.94.0.tar.gz) = 1b6a1b42e091f693f91d77eeeda1842f1e305610485802fb128dca21c3c74579efefc21a46704511dd5a272d0a1913a60e1e9563718d2e6490173e4ae73566de