update to 1.7.0

patch zipconf.h to re-add missing LIBZIP_VERSION_* macros

.gitignore

@@ -18,3 +18,4 @@ libzip-0.9.3.tar.bz2
 /libzip-1.5.2.tar.xz
 /libzip-1.6.0.tar.xz
 /libzip-1.6.1.tar.xz
+/libzip-1.7.0.tar.xz

0001-Restore-LIBZIP_VERSION_-MAJOR-MINOR-MICRO.patch

@@ -0,0 +1,26 @@
+From 79eac022219d937c291ff709353830d6f386e3c3 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <tk@giga.or.at>
+Date: Fri, 5 Jun 2020 15:47:17 +0200
+Subject: [PATCH 1/2] Restore LIBZIP_VERSION_{MAJOR,MINOR,MICRO}.
+
+---
+ cmake-zipconf.h.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/cmake-zipconf.h.in b/cmake-zipconf.h.in
+index 7ab12003..053b8bb0 100644
+--- a/cmake-zipconf.h.in
++++ b/cmake-zipconf.h.in
+@@ -9,6 +9,9 @@
+  */
+ 
+ #define LIBZIP_VERSION "${libzip_VERSION}"
++#define LIBZIP_VERSION_MAJOR "${libzip_VERSION_MAJOR}"
++#define LIBZIP_VERSION_MINOR "${libzip_VERSION_MINOR}"
++#define LIBZIP_VERSION_MICRO "${libzip_VERSION_PATCH}"
+ 
+ #cmakedefine ZIP_STATIC
+ 
+-- 
+2.25.4
+

0002-Fix-previous-the-macros-are-expected-to-be-numbers.patch

@@ -0,0 +1,30 @@
+From ac7fb1e17a01ee0b93de6192c4dbe60e979f32d7 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <tk@giga.or.at>
+Date: Fri, 5 Jun 2020 15:59:05 +0200
+Subject: [PATCH 2/2] Fix previous, the macros are expected to be numbers.
+
+From Remi Collet.
+---
+ cmake-zipconf.h.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cmake-zipconf.h.in b/cmake-zipconf.h.in
+index 053b8bb0..b88ed267 100644
+--- a/cmake-zipconf.h.in
++++ b/cmake-zipconf.h.in
+@@ -9,9 +9,9 @@
+  */
+ 
+ #define LIBZIP_VERSION "${libzip_VERSION}"
+-#define LIBZIP_VERSION_MAJOR "${libzip_VERSION_MAJOR}"
+-#define LIBZIP_VERSION_MINOR "${libzip_VERSION_MINOR}"
+-#define LIBZIP_VERSION_MICRO "${libzip_VERSION_PATCH}"
++#define LIBZIP_VERSION_MAJOR ${libzip_VERSION_MAJOR}
++#define LIBZIP_VERSION_MINOR ${libzip_VERSION_MINOR}
++#define LIBZIP_VERSION_MICRO ${libzip_VERSION_PATCH}
+ 
+ #cmakedefine ZIP_STATIC
+ 
+-- 
+2.25.4
+

libzip.spec

@@ -1,7 +1,7 @@
 %global with_tests     0%{!?_without_tests:1}
 
 Name:    libzip
-Version: 1.6.1
+Version: 1.7.0
 Release: 1%{?dist}
 Summary: C library for reading, creating, and modifying zip archives
 
@@ -9,6 +9,9 @@ License: BSD
 URL:     https://libzip.org/
 Source0: https://libzip.org/download/libzip-%{version}.tar.xz
 
+Patch0:  0001-Restore-LIBZIP_VERSION_-MAJOR-MINOR-MICRO.patch
+Patch1:  0002-Fix-previous-the-macros-are-expected-to-be-numbers.patch
+
 BuildRequires:  gcc
 BuildRequires:  zlib-devel
 BuildRequires:  bzip2-devel
@@ -114,12 +117,17 @@ make check
 %{_includedir}/zipconf*.h
 %{_libdir}/libzip.so
 %{_libdir}/pkgconfig/libzip.pc
+%{_libdir}/cmake/libzip
 %{_mandir}/man3/libzip*
 %{_mandir}/man3/zip*
 %{_mandir}/man3/ZIP*
 
 
 %changelog
+* Fri Jun  5 2020 Remi Collet <remi@remirepo.net> - 1.7.0-1
+- update to 1.7.0
+- patch zipconf.h to re-add missing LIBZIP_VERSION_* macros
+
 * Mon Feb  3 2020 Remi Collet <remi@remirepo.net> - 1.6.1-1
 - update to 1.6.1
 

sources

@@ -1 +1 @@
-SHA512 (libzip-1.6.1.tar.xz) = dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574
+SHA512 (libzip-1.7.0.tar.xz) = 9c1632b4e0b4cfe22c5670d815bc8893d540226e3e64cf8cce7039a90bdc7048dedadb4804b151291e312c97bb384bd671e43021401c4c3e33a4e597972bc681