diff --git a/0002-python-pycurl-7.45.2-disable-test_http_version_3.patch b/0002-python-pycurl-7.45.2-disable-test_http_version_3.patch deleted file mode 100644 index 388e48f..0000000 --- a/0002-python-pycurl-7.45.2-disable-test_http_version_3.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6c55e6822a064edb8dd6dfe1ee21080f4f30b5cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= -Date: Tue, 7 Mar 2023 16:32:19 +0100 -Subject: [PATCH] tests: temporarily disable test_http_version_3 - -HTTP3 support in curl is only experimental at the moment and is disabled -in the corresponding Fedora package. ---- - tests/option_constants_test.py | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/tests/option_constants_test.py b/tests/option_constants_test.py -index 7b94164..04dc3da 100644 ---- a/tests/option_constants_test.py -+++ b/tests/option_constants_test.py -@@ -508,10 +508,6 @@ class OptionConstantsSettingTest(unittest.TestCase): - def test_http_version_2prior_knowledge(self): - self.curl.setopt(self.curl.HTTP_VERSION, self.curl.CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE) - -- @util.min_libcurl(7, 66, 0) -- def test_http_version_3(self): -- self.curl.setopt(self.curl.HTTP_VERSION, self.curl.CURL_HTTP_VERSION_3) -- - @util.min_libcurl(7, 21, 5) - def test_sockopt_constants(self): - assert self.curl.SOCKOPT_OK is not None --- -2.39.2 - diff --git a/python-pycurl.spec b/python-pycurl.spec index 9291c65..c0ea59d 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -23,7 +23,7 @@ Name: python-%{modname} Version: 7.45.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A Python interface to libcurl License: curl OR LGPL-2.1-or-later @@ -32,8 +32,6 @@ Source0: https://files.pythonhosted.org/packages/a8/af/24d3acfa76b867dbd8 # drop link-time vs. run-time TLS backend check (#1446850) Patch1: 0001-python-pycurl-7.45.1-tls-backend.patch -# disable test_http_version_3 since curl in Fedora does not support it (#2175216) -Patch2: 0002-python-pycurl-7.45.2-disable-test_http_version_3.patch BuildRequires: gcc BuildRequires: libcurl-devel @@ -138,7 +136,10 @@ export OPENSSL_CONF= export PYTHONPATH=%{buildroot}%{python3_sitearch} export PYCURL_SSL_LIBRARY=openssl export PYCURL_VSFTPD_PATH=vsftpd -export PYTEST_ADDOPTS="--ignore examples -m 'not online'" + +# disable test_http_version_3 since curl in Fedora does not support it (#2175216) +# disable tests incompatible with curl 8.4.0 and newer +export PYTEST_ADDOPTS="--ignore examples -m 'not online' -k 'not (test_http_version_3 or test_multi_socket_action or test_multi_socket_select or test_easy_pause_unpause)'" make test PYTHON=%{__python3} PYTEST=%{pytest} PYFLAKES=true %endif @@ -161,6 +162,9 @@ make test PYTHON=%{__python3} PYTEST=%{pytest} PYFLAKES=true %endif %changelog +* Mon Jan 22 2024 Lukáš Zaoral - 7.45.2-9 +- fix FTBFS on Rawhide + * Mon Jan 22 2024 Fedora Release Engineering - 7.45.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild