diff --git a/aiohttp-3.6.0-fix-typeerror.patch b/aiohttp-3.6.0-fix-typeerror.patch new file mode 100644 index 0000000..8c79ca8 --- /dev/null +++ b/aiohttp-3.6.0-fix-typeerror.patch @@ -0,0 +1,22 @@ +From: Matthias Fehring +Date: 2019-09-18 09:23:00 +0200 +Subject: fix type error +Upstream: merged (https://github.com/aio-libs/aiohttp/pull/4057) + +At least multidict 4.5 is now required. + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/setup.py 2019-09-06 14:54:33.000000000 +0200 ++++ b/setup.py 2019-09-18 09:19:56.227118006 +0200 +@@ -71,7 +71,7 @@ + install_requires = [ + 'attrs>=17.3.0', + 'chardet>=2.0,<4.0', +- 'multidict>=4.0,<5.0', ++ 'multidict>=4.5,<5.0', + 'async_timeout>=3.0,<4.0', + 'yarl>=1.0,<2.0', + 'idna-ssl>=1.0; python_version<"3.7"', diff --git a/python-aiohttp.changes b/python-aiohttp.changes index c12ffac..488d4a3 100644 --- a/python-aiohttp.changes +++ b/python-aiohttp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 18 07:34:10 UTC 2019 - Matthias Fehring + +- Add patch to fix type error with old multidict: + * aiohttp-3.6.0-fix-typeerror.patch +- Require python-multidict 4.5 or newer + ------------------------------------------------------------------- Fri Sep 13 12:05:43 UTC 2019 - Tomáš Chvátal diff --git a/python-aiohttp.spec b/python-aiohttp.spec index e6ccd1f..bfe2b45 100644 --- a/python-aiohttp.spec +++ b/python-aiohttp.spec @@ -26,12 +26,14 @@ License: Apache-2.0 Group: Development/Languages/Python URL: https://github.com/aio-libs/aiohttp Source: https://files.pythonhosted.org/packages/source/a/aiohttp/aiohttp-%{version}.tar.gz +# PATCH-FIX-UPSTREAM aiohttp-3.6.0-fix-typeerror.patch +Patch0: aiohttp-3.6.0-fix-typeerror.patch BuildRequires: %{python_module Cython} BuildRequires: %{python_module async_timeout >= 3.0} BuildRequires: %{python_module attrs >= 17.3.0} BuildRequires: %{python_module chardet >= 2.0} BuildRequires: %{python_module devel >= 3.5.3} -BuildRequires: %{python_module multidict >= 4.0} +BuildRequires: %{python_module multidict >= 4.5} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -41,7 +43,7 @@ Requires: python-attrs >= 17.3.0 Requires: python-brotlipy Requires: python-chardet >= 2.0 Requires: python-gunicorn -Requires: python-multidict >= 4.0 +Requires: python-multidict >= 4.5 Requires: python-yarl >= 1.0 Recommends: python-aiodns Recommends: python-cChardet @@ -93,6 +95,7 @@ HTML documentation on the API and examples for %{name}. %prep %setup -q -n aiohttp-%{version} +%patch0 -p1 %build export CFLAGS="%{optflags}"