diff --git a/fix-zstd-1.5.6.patch b/fix-zstd-1.5.6.patch deleted file mode 100644 index 245fee1..0000000 --- a/fix-zstd-1.5.6.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://github.com/indygreg/python-zstandard/pull/221 - -commit e362dd47a0a339cd95a663ca4e54e628060ce6f1 -Author: Bernhard M. Wiedemann -Date: Fri Apr 5 08:55:10 2024 +0200 - - Support zstd-1.5.6 - -diff --git a/c-ext/backend_c.c b/c-ext/backend_c.c -index bf61f9c..aabe30b 100644 ---- a/c-ext/backend_c.c -+++ b/c-ext/backend_c.c -@@ -152,7 +152,7 @@ void zstd_module_init(PyObject *m) { - PyObject *features = NULL; - PyObject *feature = NULL; - unsigned zstd_ver_no = ZSTD_versionNumber(); -- unsigned our_hardcoded_version = 10505; -+ unsigned our_hardcoded_version = 10506; - if (ZSTD_VERSION_NUMBER != our_hardcoded_version || - zstd_ver_no != our_hardcoded_version) { - PyErr_Format( -diff --git a/tests/test_module_attributes.py b/tests/test_module_attributes.py -index 145f7be..1f37b82 100644 ---- a/tests/test_module_attributes.py -+++ b/tests/test_module_attributes.py -@@ -5,7 +5,7 @@ import zstandard as zstd - - class TestModuleAttributes(unittest.TestCase): - def test_version(self): -- self.assertEqual(zstd.ZSTD_VERSION, (1, 5, 5)) -+ self.assertEqual(zstd.ZSTD_VERSION, (1, 5, 6)) - - self.assertEqual(zstd.__version__, "0.22.0") - diff --git a/fix-zstd-1.5.7.patch b/fix-zstd-1.5.7.patch new file mode 100644 index 0000000..7ea048f --- /dev/null +++ b/fix-zstd-1.5.7.patch @@ -0,0 +1,79 @@ +Index: zstandard-0.22.0/tests/test_compressor_compress.py +=================================================================== +--- zstandard-0.22.0.orig/tests/test_compressor_compress.py ++++ zstandard-0.22.0/tests/test_compressor_compress.py +@@ -52,7 +52,7 @@ class TestCompressor_compress(unittest.T + + cctx = zstd.ZstdCompressor(level=3, write_content_size=False) + result = cctx.compress(b"".join(chunks)) +- self.assertEqual(len(result), 999) ++ self.assertEqual(len(result), 1029) + self.assertEqual(result[0:4], b"\x28\xb5\x2f\xfd") + + # This matches the test for read_to_iter() below. +Index: zstandard-0.22.0/tests/test_compressor_compressobj.py +=================================================================== +--- zstandard-0.22.0.orig/tests/test_compressor_compressobj.py ++++ zstandard-0.22.0/tests/test_compressor_compressobj.py +@@ -39,7 +39,7 @@ class TestCompressor_compressobj(unittes + cobj = cctx.compressobj() + + result = cobj.compress(b"".join(chunks)) + cobj.flush() +- self.assertEqual(len(result), 999) ++ self.assertEqual(len(result), 1029) + self.assertEqual(result[0:4], b"\x28\xb5\x2f\xfd") + + params = zstd.get_frame_parameters(result) +Index: zstandard-0.22.0/tests/test_compressor_copy_stream.py +=================================================================== +--- zstandard-0.22.0.orig/tests/test_compressor_copy_stream.py ++++ zstandard-0.22.0/tests/test_compressor_copy_stream.py +@@ -50,7 +50,7 @@ class TestCompressor_copy_stream(unittes + r, w = cctx.copy_stream(source, dest) + + self.assertEqual(r, 255 * 16384) +- self.assertEqual(w, 999) ++ self.assertEqual(w, 1029) + + params = zstd.get_frame_parameters(dest.getvalue()) + self.assertEqual(params.content_size, zstd.CONTENTSIZE_UNKNOWN) +Index: zstandard-0.22.0/tests/test_compressor_stream_writer.py +=================================================================== +--- zstandard-0.22.0.orig/tests/test_compressor_stream_writer.py ++++ zstandard-0.22.0/tests/test_compressor_stream_writer.py +@@ -301,7 +301,7 @@ class TestCompressor_stream_writer(unitt + d = zstd.train_dictionary(8192, samples) + + h = hashlib.sha1(d.as_bytes()).hexdigest() +- self.assertEqual(h, "a46d2f7a3bc3357c9d717d3dadf9a26fde23e93d") ++ self.assertEqual(h, "f32ddfbe0878bbd428afc00b17810387c6752191") + + buffer = io.BytesIO() + cctx = zstd.ZstdCompressor(level=9, dict_data=d) + +Index: zstandard-0.22.0/c-ext/backend_c.c +=================================================================== +--- zstandard-0.22.0.orig/c-ext/backend_c.c ++++ zstandard-0.22.0/c-ext/backend_c.c +@@ -152,7 +152,7 @@ void zstd_module_init(PyObject *m) { + PyObject *features = NULL; + PyObject *feature = NULL; + unsigned zstd_ver_no = ZSTD_versionNumber(); +- unsigned our_hardcoded_version = 10505; ++ unsigned our_hardcoded_version = 10507; + if (ZSTD_VERSION_NUMBER != our_hardcoded_version || + zstd_ver_no != our_hardcoded_version) { + PyErr_Format( +Index: zstandard-0.22.0/tests/test_module_attributes.py +=================================================================== +--- zstandard-0.22.0.orig/tests/test_module_attributes.py ++++ zstandard-0.22.0/tests/test_module_attributes.py +@@ -5,7 +5,7 @@ import zstandard as zstd + + class TestModuleAttributes(unittest.TestCase): + def test_version(self): +- self.assertEqual(zstd.ZSTD_VERSION, (1, 5, 5)) ++ self.assertEqual(zstd.ZSTD_VERSION, (1, 5, 7)) + + self.assertEqual(zstd.__version__, "0.22.0") + diff --git a/python-zstandard.changes b/python-zstandard.changes index feea41c..80da27b 100644 --- a/python-zstandard.changes +++ b/python-zstandard.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 21 10:44:16 UTC 2025 - Bernhard Wiedemann + +- Add fix-zstd-1.5.7.patch to make it work with zstd-1.5.7 +- Drop fix-zstd-1.5.6.patch +- Require libzstd1 = 1.5.7 + ------------------------------------------------------------------- Tue Aug 6 03:43:14 UTC 2024 - Bernhard Wiedemann diff --git a/python-zstandard.spec b/python-zstandard.spec index 9a7f3cb..96c4847 100644 --- a/python-zstandard.spec +++ b/python-zstandard.spec @@ -26,15 +26,14 @@ Group: Development/Languages/Python URL: https://github.com/indygreg/python-zstandard Source: https://files.pythonhosted.org/packages/source/z/zstandard/zstandard-%{version}.tar.gz Patch0: feature-detection.patch -Patch1: fix-zstd-1.5.6.patch +Patch1: fix-zstd-1.5.7.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes -BuildRequires: libzstd-devel +BuildRequires: libzstd-devel = 1.5.7 BuildRequires: python-rpm-macros -BuildRequires: zstd = 1.5.6 +Requires: libzstd1 = 1.5.7 Requires: python-cffi >= 1.11 -Requires: zstd # SECTION test requirements BuildRequires: %{python_module cffi >= 1.11} BuildRequires: %{python_module exceptiongroup}