diff --git a/_service b/_service new file mode 100644 index 0000000..986fe02 --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + 7.45.3+git + https://github.com/pycurl/pycurl.git + git + main + enable + + + + *.tar + gz + + + diff --git a/increase_test_timeout.diff b/increase_test_timeout.diff index ec514e7..84b2a77 100644 --- a/increase_test_timeout.diff +++ b/increase_test_timeout.diff @@ -1,8 +1,10 @@ -Index: pycurl-7.43.0/tests/runwsgi.py -=================================================================== ---- pycurl-7.43.0.orig/tests/runwsgi.py -+++ pycurl-7.43.0/tests/runwsgi.py -@@ -48,10 +48,10 @@ def start_bottle_server(app, port, serve +--- + tests/runwsgi.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/tests/runwsgi.py ++++ b/tests/runwsgi.py +@@ -56,10 +56,10 @@ def start_bottle_server(app, port, serve server_thread.daemon = True server_thread.start() diff --git a/pycurl-libssh.patch b/pycurl-libssh.patch index 61cc184..475c57d 100644 --- a/pycurl-libssh.patch +++ b/pycurl-libssh.patch @@ -1,3 +1,7 @@ +--- + tests/ssh_key_cb_test.py | 31 +++++++++++++++++++++++-------- + 1 file changed, 23 insertions(+), 8 deletions(-) + --- a/tests/ssh_key_cb_test.py +++ b/tests/ssh_key_cb_test.py @@ -33,8 +33,11 @@ class SshKeyCbTest(unittest.TestCase): diff --git a/python-pycurl.changes b/python-pycurl.changes index a524b67..0516d33 100644 --- a/python-pycurl.changes +++ b/python-pycurl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 9 09:38:48 UTC 2024 - Matej Cepl + +- Switch to %pyproject_*. + ------------------------------------------------------------------- Fri Oct 4 14:25:56 UTC 2024 - Matej Cepl diff --git a/python-pycurl.spec b/python-pycurl.spec index 0e79c2c..b2a5011 100644 --- a/python-pycurl.spec +++ b/python-pycurl.spec @@ -25,6 +25,7 @@ %define psuffix %{nil} %bcond_with test %endif +%define upversion 7.45.3 %{?sle15_python_module_pythons} Name: python-pycurl%{psuffix} Version: 7.45.3 @@ -33,6 +34,7 @@ Summary: PycURL -- cURL library module License: LGPL-2.1-or-later AND MIT URL: http://pycurl.io/ Source: https://files.pythonhosted.org/packages/source/p/pycurl/pycurl-%{version}.tar.gz +# Source: pycurl-%%{version}.tar.gz # PATCH-FIX-OPENSUSE increase_test_timeout.diff -- Increase the timeout in a test so it doesn't fail when obs is overloaded Patch0: increase_test_timeout.diff # PATCH-FIX-UPSTREAM handle difference between libssh and libssh2 @@ -44,7 +46,9 @@ Patch3: make-leap15-compat.patch # PATCH-FIX-UPSTREAM test-bottle-flask.patch gh#pycurl/pycurl#838 Patch4: test-bottle-flask.patch BuildRequires: %{python_module devel} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: python-rpm-macros @@ -86,11 +90,11 @@ rm -f tests/failonerror_test.py %build export CFLAGS="%{optflags} -fno-strict-aliasing" export PYCURL_SSL_LIBRARY=openssl -%python_build --with-openssl +%pyproject_wheel %install export PYCURL_SSL_LIBRARY=openssl -%python_install --with-openssl +%pyproject_install rm -rf %{buildroot}%{_datadir}/doc # Remove wrongly installed junk @@ -108,7 +112,7 @@ export PYCURL_SSL_LIBRARY=openssl # not the rest of the mess in the upstream runner pushd tests/fake-curl/libcurl rm -f *.so -make %{?_smp_mflags} +%make_build popd # exclude certain tests test_flags='online or occasionally_failing' @@ -142,7 +146,7 @@ rm -rf %{buildroot}%{_prefix}/lib/debug %{buildroot}%{_libdir}/python* %doc AUTHORS ChangeLog README.rst %{python_sitearch}/curl %{python_sitearch}/pycurl*.so -%{python_sitearch}/pycurl-%{version}*-info +%{python_sitearch}/pycurl-%{upversion}*-info %if 0%{?suse_version} > 1500 %files -n %{name}-doc