diff --git a/.gitignore b/.gitignore index 38e9555..e89bae2 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /accerciser-3.13.92.tar.xz /accerciser-3.14.0.tar.xz /accerciser-3.22.0.tar.xz +/accerciser-3.31.4.tar.xz diff --git a/0001-Python-3.7-support-async-is-a-keyword.patch b/0001-Python-3.7-support-async-is-a-keyword.patch deleted file mode 100644 index d481d48..0000000 --- a/0001-Python-3.7-support-async-is-a-keyword.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 613ee939c3062c952bfaff432395f890d044e8d1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Thu, 28 Jun 2018 19:20:17 +0200 -Subject: [PATCH] Python 3.7+ support, async is a keyword - - File "accerciser/accerciser.py", line 106 - pyatspi.Registry.start(async=True, gil=False) - ^ - SyntaxError: invalid syntax ---- - src/lib/accerciser/accerciser.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/lib/accerciser/accerciser.py b/src/lib/accerciser/accerciser.py -index fa6e5c7..065a7fe 100644 ---- a/src/lib/accerciser/accerciser.py -+++ b/src/lib/accerciser/accerciser.py -@@ -103,7 +103,8 @@ class Main(Tools): - ''' - GLib.timeout_add(200, self._pumpEvents) - try: -- pyatspi.Registry.start(async=True, gil=False) -+ # async is a reserved keyword in Python 3.7+, so we pass the args as dict -+ pyatspi.Registry.start(**{'async': True, 'gil': False}) - except KeyboardInterrupt: - self._shutDown() - --- -2.17.0 - diff --git a/accerciser.spec b/accerciser.spec index 95e947e..7561136 100644 --- a/accerciser.spec +++ b/accerciser.spec @@ -2,17 +2,14 @@ %define release_version %(echo %{version} | awk -F. '{print $1"."$2}') Name: accerciser -Version: 3.22.0 -Release: 8%{?dist} +Version: 3.31.4 +Release: 1%{?dist} Summary: Interactive Python accessibility explorer for the GNOME desktop License: BSD URL: https://wiki.gnome.org/Apps/Accerciser Source0: https://download.gnome.org/sources/accerciser/%{release_version}/accerciser-%{version}.tar.xz -# https://gitlab.gnome.org/GNOME/accerciser/merge_requests/1 -Patch0: 0001-Python-3.7-support-async-is-a-keyword.patch - BuildArch: noarch BuildRequires: at-spi2-core-devel @@ -50,12 +47,6 @@ make %{?_smp_mflags} %install %make_install -# Fix appdata file name to match the desktop file name -# https://git.gnome.org/browse/accerciser/commit/?id=b0f31fabe4f612490b3924d337bc12fea1d502f4 -mv $RPM_BUILD_ROOT%{_datadir}/appdata/org.gnome.accerciser.appdata.xml \ - $RPM_BUILD_ROOT%{_datadir}/appdata/accerciser.appdata.xml -sed -i -e 's/org.gnome.accerciser\.desktop/accerciser.desktop/' $RPM_BUILD_ROOT%{_datadir}/appdata/accerciser.appdata.xml - %find_lang accerciser --with-gnome @@ -79,6 +70,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/accerciser.desktop %changelog +* Mon Jan 14 2019 Kalev Lember - 3.31.4-1 +- Update to 3.31.4 + * Thu Jul 12 2018 Fedora Release Engineering - 3.22.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 3be1fa1..5b942d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a6885691d7639c34ec83d5d6ff5389fe accerciser-3.22.0.tar.xz +SHA512 (accerciser-3.31.4.tar.xz) = 44102d5bd232ac65932edc7d5e7938311d43cf8b9309b082f0c7de88c96e215acd2e8a6b9b15d1395434b22d630c387a0a037cb11f4fbf61c58a04a00d98add6