diff --git a/pyatspi.spec b/pyatspi.spec index f89fa7a..a3eca2b 100644 --- a/pyatspi.spec +++ b/pyatspi.spec @@ -2,14 +2,13 @@ Name: pyatspi Version: 2.33.92 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python bindings for at-spi License: LGPLv2 and GPLv2 URL: http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus Source0: http://download.gnome.org/sources/pyatspi/2.33/%{name}-%{version}.tar.xz -BuildRequires: python2-devel # For tests BuildRequires: pkgconfig(dbus-1) >= 1.0 BuildRequires: pkgconfig(glib-2.0) @@ -20,13 +19,9 @@ BuildRequires: pkgconfig(libxml-2.0) >= 2.0.0 BuildRequires: pkgconfig(atk) >= 2.11.2 BuildRequires: pkgconfig(gtk+-2.0) >= 2.10.0 BuildRequires: pkgconfig(pygobject-3.0) >= 2.90.1 -BuildRequires: python2-dbus -BuildRequires: python2-enum34 -%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: python3-devel BuildRequires: python3-dbus -%endif BuildArch: noarch @@ -41,18 +36,6 @@ This package includes a python2 client library for at-spi.\ %description %_description -%package -n python2-pyatspi -Summary: %summary -Requires: at-spi2-core -Requires: python2-gobject -%{?python_provide:%python_provide python2-pyatspi} -# Remove before F30 -Provides: pyatspi%{?_isa} = %{version}-%{release} -Obsoletes: pyatspi < %{version}-%{release} - -%description -n python2-pyatspi %_description - -%if 0%{?fedora} || 0%{?rhel} > 7 %package -n python3-pyatspi Summary: Python3 bindings for at-spi Requires: at-spi2-core @@ -65,66 +48,41 @@ automation, so tools such as screen readers, magnifiers, or even scripting interfaces can query and interact with GUI controls. This package includes a python3 client library for at-spi. -%endif %prep %autosetup -p1 -%if 0%{?fedora} || 0%{?rhel} > 7 -# Make a copy of the source tree for building the python3 module -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif - %build -# Build the python2 module -%configure --with-python=python2 --enable-tests -make - -%if 0%{?fedora} || 0%{?rhel} > 7 -# Build the python3 module -pushd %{py3dir} %configure --with-python=python3 --enable-tests make -popd -%endif %install %make_install -%if 0%{?fedora} || 0%{?rhel} > 7 -pushd %{py3dir} %make_install -popd # Fix up the shebang for python3 example -cp -a examples python3-examples -sed -i '1s|^#!/usr/bin/python|#!%{__python3}|' python3-examples/magFocusTracker.py -%endif +sed -i '1s|^#!/usr/bin/python|#!%{__python3}|' examples/magFocusTracker.py %check # Done by the 'build' step, with --enable-tests -%files -n python2-pyatspi -%license COPYING COPYING.GPL -%doc AUTHORS README -%doc examples/magFocusTracker.py -%{python2_sitelib}/pyatspi/ - -%if 0%{?fedora} || 0%{?rhel} > 7 %files -n python3-pyatspi %license COPYING COPYING.GPL %doc AUTHORS README -%doc python3-examples/magFocusTracker.py +%doc examples/magFocusTracker.py %{python3_sitelib}/pyatspi/ -%endif %changelog +* Thu Sep 05 2019 Miro HronĨok - 2.33.92-2 +- Subpackage python2-pyatspi has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Tue Sep 03 2019 Kalev Lember - 2.33.92-1 - Update to 2.33.92