diff --git a/zchunk.changes b/zchunk.changes index 125461a..8c37475 100644 --- a/zchunk.changes +++ b/zchunk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 3 20:35:40 UTC 2022 - Dirk Müller + +- add zstd-1.5.1.patch (gh#zchunk/zchunk/57) + ------------------------------------------------------------------- Thu Jun 24 09:51:46 UTC 2021 - Ferdinand Thiessen diff --git a/zchunk.spec b/zchunk.spec index d2ae8c3..8d4916a 100644 --- a/zchunk.spec +++ b/zchunk.spec @@ -1,7 +1,7 @@ # # spec file for package zchunk # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2020 Neal Gompa . # # All modifications and additions to the file contributed by third parties @@ -20,7 +20,6 @@ %global somajor 1 %global libname libzck%{somajor} %global devname libzck-devel - Name: zchunk Version: 1.1.16 Release: 0 @@ -29,6 +28,7 @@ License: BSD-2-Clause AND MIT Group: Productivity/Archiving/Compression URL: https://github.com/zchunk/zchunk Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch1: zstd-1.5.1.patch BuildRequires: meson >= 0.44.0 BuildRequires: pkgconfig BuildRequires: pkgconfig(libcurl) diff --git a/zstd-1.5.1.patch b/zstd-1.5.1.patch new file mode 100644 index 0000000..f3cc6d0 --- /dev/null +++ b/zstd-1.5.1.patch @@ -0,0 +1,50 @@ +--- zchunk-1.1.16/test/meson.build ++++ zchunk-1.1.16/test/meson.build +@@ -214,7 +214,10 @@ + ) + + if build_machine.endian() != 'big' +- check_sha = '4f07f865bb15624cf854aa369e14a3538ad9e9bf98e233036d37d2568e60b7cc' ++ check_sha = 'ac9d431f1f568d8921257fa17929c320f0cdcbff450d9f3c38c78c4f410ee788' ++ if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.0') ++ check_sha = '4f07f865bb15624cf854aa369e14a3538ad9e9bf98e233036d37d2568e60b7cc' ++ endif + if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.9') + check_sha = 'eff3098803ba80f0c446d49f48188f89167d7f29cdc8a98c19f0ecfb4e2ee3c9' + endif +@@ -251,7 +254,10 @@ + ) + + +- check_sha = '11d08d01c7877d51b84a0f97ebf651ca3304de10cdf207223df2dbc3295fa532' ++ check_sha = '35549b28b01c0a43d7389d4c40d5b750c73fb6c0c6701355ef709ef4a37df389' ++ if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.0') ++ check_sha = '11d08d01c7877d51b84a0f97ebf651ca3304de10cdf207223df2dbc3295fa532' ++ endif + if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.9') + check_sha = 'b86795ca14eb04b382d1c7f94501aa5d1a2ddb05a5351c0235d00edb954e9b66' + endif +@@ -285,7 +291,10 @@ + is_parallel: false + ) + +- check_sha = 'db42e903a2cf3b859835298272ff45bff6d2435d32fe7fda2bfe2815ab161994' ++ check_sha = '2580f66412adce1ed8d92abc09b0f64eb155155f61e21a8269a2c4a338857e51' ++ if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.0') ++ check_sha = 'db42e903a2cf3b859835298272ff45bff6d2435d32fe7fda2bfe2815ab161994' ++ endif + if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.9') + check_sha = 'c46929367cd3d05daaca3b44657726791b428fb2198f5e7e5367b5cc781307aa' + endif +@@ -326,7 +335,10 @@ + is_parallel: false + ) + +- check_sha = 'ee8df850bc4797e6696b966a74a459129b0f6d23dfb720d1cc8cba6f2b209dd2' ++ check_sha = '863dc2bda721a32c26485eeb2223d5dabcf9ac517ecba8c7991fa0120d04c937' ++ if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.0') ++ check_sha = 'ee8df850bc4797e6696b966a74a459129b0f6d23dfb720d1cc8cba6f2b209dd2' ++ endif + if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.9') + check_sha = '5fc2449aeb51f6a898529fa4d53b04de6df6a352826f819dc2b39b153ddaa788' + endif