From d4c49e08218d700df388057002824720643bf7b5 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Fri, 25 Jun 2021 12:56:36 +0200 Subject: [PATCH] Require python3-packaging instead of python3-setuptools, BuildRequire glibc-conv-extra only on Fedora >= 35 --- ibus-typing-booster.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ibus-typing-booster.spec b/ibus-typing-booster.spec index 09be465..98b0a29 100644 --- a/ibus-typing-booster.spec +++ b/ibus-typing-booster.spec @@ -10,8 +10,8 @@ Requires: m17n-lib %{?__python3:Requires: %{__python3}} Requires: python3-dbus Requires: python3-distro -# Require python3-setuptools because of “from packing import version”: -Requires: python3-setuptools +# because of “from packing import version”: +Requires: python3-packaging Requires: python3-enchant Requires: python3-pyxdg %if 0%{?fedora} >= 24 || 0%{?rhel} > 7 @@ -44,10 +44,12 @@ BuildRequires: python34-devel BuildRequires: m17n-lib BuildRequires: m17n-db-extras BuildRequires: python3-enchant -# Require python3-setuptools because of “from packing import version”: -BuildRequires: python3-setuptools +# because of “from packing import version”: +BuildRequires: python3-packaging +%if 0%{?fedora} >= 35 # to make the python3-enchant test work for hunspell dictionaries which are not yet UTF-8: BuildRequires: glibc-gconv-extra +%endif %if 0%{?fedora} && 0%{?fedora} >= 34 BuildRequires: python3-libvoikko BuildRequires: voikko-fi