Accepting request 888805 from Archiving

OBS-URL: https://build.opensuse.org/request/show/888805
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zchunk?expand=0&rev=10

d2eae512bee09a4047cfe586de12f644d73b0736.patch

@@ -1,62 +0,0 @@
-From d2eae512bee09a4047cfe586de12f644d73b0736 Mon Sep 17 00:00:00 2001
-From: Jonathan Dieter <jdieter@gmail.com>
-Date: Wed, 30 Dec 2020 22:44:08 +0000
-Subject: [PATCH] Handle zstd 1.4.7+
-
-Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
----
- test/meson.build | 20 ++++++++++++++++----
- 1 file changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/test/meson.build b/test/meson.build
-index d010b92..2d9c8a4 100644
---- a/test/meson.build
-+++ b/test/meson.build
-@@ -214,7 +214,10 @@ test(
- )
- 
- if build_machine.endian() != 'big'
--    check_sha = '45e48c11fea129d2c434ffcec7d8fbc1720f30f33d438654cd117616121c218e'
-+    check_sha = 'eff3098803ba80f0c446d49f48188f89167d7f29cdc8a98c19f0ecfb4e2ee3c9'
-+    if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.6')
-+        check_sha = '45e48c11fea129d2c434ffcec7d8fbc1720f30f33d438654cd117616121c218e'
-+    endif
-     if zstd_dep.found() and zstd_dep.version().version_compare('<=1.3.5')
-         check_sha = '45e48c11fea129d2c434ffcec7d8fbc1720f30f33d438654cd117616121c218e'
-     endif
-@@ -234,7 +237,10 @@ if build_machine.endian() != 'big'
-         ]
-     )
- 
--    check_sha = 'b4805798547be62421944a87db3a90de455b4772c6013e685720b49336b8b17e'
-+    check_sha = 'b86795ca14eb04b382d1c7f94501aa5d1a2ddb05a5351c0235d00edb954e9b66'
-+    if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.6')
-+        check_sha = 'b4805798547be62421944a87db3a90de455b4772c6013e685720b49336b8b17e'
-+    endif
-     if zstd_dep.found() and zstd_dep.version().version_compare('<=1.3.4')
-         check_sha = '0fb0f2262c62714063e409117fcbd4c114b35e3abbfc90b042a41246b62ff789'
-     endif
-@@ -252,7 +258,10 @@ if build_machine.endian() != 'big'
-     )
- endif
- 
--check_sha = '9472ddc74dbd96291077bbb8d793e605824be8dba45e3e94bbc54b7de21a37a1'
-+check_sha = 'c46929367cd3d05daaca3b44657726791b428fb2198f5e7e5367b5cc781307aa'
-+if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.6')
-+    check_sha = '9472ddc74dbd96291077bbb8d793e605824be8dba45e3e94bbc54b7de21a37a1'
-+endif
- if zstd_dep.found() and zstd_dep.version().version_compare('<=1.3.5')
-     check_sha = '6911b50cad5b6ed3ee89322338c559afdd0e72f614d3817b47ce370df52fd6b4'
- endif
-@@ -276,7 +285,10 @@ test(
-     ]
- )
- 
--check_sha = '4e86b47410a3a5090c7d60040d24d8d390c31f16f96ea112c8f153888eaf8c6e'
-+check_sha = '5fc2449aeb51f6a898529fa4d53b04de6df6a352826f819dc2b39b153ddaa788'
-+if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.6')
-+    check_sha = '4e86b47410a3a5090c7d60040d24d8d390c31f16f96ea112c8f153888eaf8c6e'
-+endif
- if zstd_dep.found() and zstd_dep.version().version_compare('<=1.3.5')
-     check_sha = '62ee66fbf41a1f18617f400383eb38905050050f0f435a6e56df4a30d1bb694d'
- endif

fix-test-argp.patch

@@ -0,0 +1,12 @@
+diff -Nur zchunk-1.1.9/meson.build new/meson.build
+--- zchunk-1.1.9/meson.build	2020-12-30 23:47:08.000000000 +0100
++++ new/meson.build	2021-04-27 00:18:38.152514197 +0200
+@@ -28,7 +28,7 @@
+ 
+ curl_dep = dependency('libcurl')
+ 
+-if build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include <argp.h>\nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); }; void main() {}')
++if build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include <argp.h>\nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); return 0; }; void main() {}')
+     argplib = cc.find_library('argp')
+ else
+     argplib = dependency('', required : false)

zchunk-1.1.5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f55ac0227a16bf82a31c18d1518577fc235dca2cad0c65e2cc243f8f9570e416
-size 1448412

zchunk-1.1.9.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e9bac8bb92e86eba50dc7fcf1f79e7835534c3aa15274355ffd84a8bcc03f91
+size 1449219

zchunk.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Apr 26 21:13:02 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to version 1.1.9
+  * Handle zstd 1.4.7+
+  * Update documentation
+  * unzck: require a *.zck extension
+  * General bug fixes
+- Dropped upstream merged
+  d2eae512bee09a4047cfe586de12f644d73b0736.patch
+- Add fix-test-argp.patch: Fix argp detection
+
 -------------------------------------------------------------------
 Mon Jan  4 08:39:16 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 

zchunk.spec

@@ -22,14 +22,15 @@
 %global devname libzck-devel
 
 Name:           zchunk
-Version:        1.1.5
+Version:        1.1.9
 Release:        0
 Summary:        Compressed file format that allows easy deltas
 License:        BSD-2-Clause AND MIT
 Group:          Productivity/Archiving/Compression
 URL:            https://github.com/zchunk/zchunk
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Patch0:         https://github.com/zchunk/zchunk/commit/d2eae512bee09a4047cfe586de12f644d73b0736.patch
+# PATCH-FIX-UPSTREAM https://github.com/zchunk/zchunk/pull/39
+Patch0:         fix-test-argp.patch
 BuildRequires:  meson >= 0.44.0
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(libcurl)
@@ -97,15 +98,16 @@ install -p contrib/gen_xml_dictionary %{buildroot}%{_libexecdir}/zck_gen_xml_dic
 %postun -n %{libname} -p /sbin/ldconfig
 
 %files
-%doc README.md contrib
 %license LICENSE
+%doc README.md contrib
 %{_bindir}/zck*
 %{_bindir}/unzck
 %{_libexecdir}/zck_gen_xml_dictionary
+%{_mandir}/man1/unzck.1%{?ext_man}
+%{_mandir}/man1/zck*.1%{?ext_man}
 
 %files -n %{libname}
 %license LICENSE
-%doc README.md
 %{_libdir}/libzck.so.%{somajor}
 %{_libdir}/libzck.so.%{version}