From 82df0a0ccbca240cb2da1246dc0b05824de76867 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Oct 01 2021 09:45:36 +0000 Subject: Update to 0.7.20 Signed-off-by: Igor Raits --- diff --git a/.gitignore b/.gitignore index 90ffff4..c54063f 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /libsolv-0.7.15.tar.gz /libsolv-0.7.17.tar.gz /libsolv-0.7.19.tar.gz +/libsolv-0.7.20.tar.gz diff --git a/0001-Fix-compatibility-with-Python-3.10.patch b/0001-Fix-compatibility-with-Python-3.10.patch deleted file mode 100644 index 0ee28f0..0000000 --- a/0001-Fix-compatibility-with-Python-3.10.patch +++ /dev/null @@ -1,37 +0,0 @@ -From cbf668383d83f29dd9e61ca224c242b2db337663 Mon Sep 17 00:00:00 2001 -From: Igor Raits -Date: Sun, 18 Jul 2021 18:47:05 +0200 -Subject: [PATCH] Fix compatibility with Python 3.10 - -Fixes: https://github.com/openSUSE/libsolv/issues/461 -Signed-off-by: Igor Raits ---- - bindings/solv.i | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/bindings/solv.i b/bindings/solv.i -index 3bbeca04..abfb5e15 100644 ---- a/bindings/solv.i -+++ b/bindings/solv.i -@@ -10,6 +10,12 @@ - %markfunc Pool "mark_Pool"; - #endif - -+#ifdef SWIGPYTHON -+%begin %{ -+#define PY_SSIZE_T_CLEAN -+%} -+#endif -+ - /** - ** binaryblob handling - **/ -@@ -69,7 +75,7 @@ typedef struct { - - %typemap(out,noblock=1,fragment="SWIG_FromCharPtrAndSize") BinaryBlob { - #if defined(SWIGPYTHON) && defined(PYTHON3) -- $result = $1.data ? Py_BuildValue("y#", $1.data, $1.len) : SWIG_Py_Void(); -+ $result = $1.data ? Py_BuildValue("y#", $1.data, (Py_ssize_t)$1.len) : SWIG_Py_Void(); - #elif defined(SWIGTCL) - Tcl_SetObjResult(interp, $1.data ? Tcl_NewByteArrayObj($1.data, $1.len) : NULL); - #else diff --git a/libsolv.spec b/libsolv.spec index ce3b07d..cb517c0 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -22,14 +22,13 @@ %define __cmake_switch(b:) %[%{expand:%%{?with_%{-b*}}} ? "ON" : "OFF"] Name: lib%{libname} -Version: 0.7.19 +Version: 0.7.20 Release: %autorelease Summary: Package dependency solver License: BSD URL: https://github.com/openSUSE/libsolv Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0001: https://github.com/openSUSE/libsolv/pull/462.patch#/0001-Fix-compatibility-with-Python-3.10.patch BuildRequires: cmake BuildRequires: gcc-c++ diff --git a/sources b/sources index 7b95c03..cdb6965 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libsolv-0.7.19.tar.gz) = dfcebea314d549a15bf5af19db775ff1b1850bfc6fb147b68fe094e43bf1541fcfe22d2f6c6607a6393e01905a086cea606d0b25da2e3ce376d100c4ef4fee00 +SHA512 (libsolv-0.7.20.tar.gz) = be810a78543509c60fe9be9310cc84b6c75e671b77929a1f914f51d4b3b2364e68398794d4648da46691cde7e5aab3cf57d18969c31f1003692080dc1982e955