From 4720591f6adfe4411d8384e8250dbf03e5299268 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 15 Jun 2020 08:29:07 +0200
Subject: [PATCH] v1.7.1

---
 .gitignore                                    |  1 +
 ...re-LIBZIP_VERSION_-MAJOR-MINOR-MICRO.patch | 26 ----------------
 ...he-macros-are-expected-to-be-numbers.patch | 30 -------------------
 libzip.spec                                   |  8 ++---
 sources                                       |  2 +-
 5 files changed, 6 insertions(+), 61 deletions(-)
 delete mode 100644 0001-Restore-LIBZIP_VERSION_-MAJOR-MINOR-MICRO.patch
 delete mode 100644 0002-Fix-previous-the-macros-are-expected-to-be-numbers.patch

diff --git a/.gitignore b/.gitignore
index e58af17..9409a2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ libzip-0.9.3.tar.bz2
 /libzip-1.6.0.tar.xz
 /libzip-1.6.1.tar.xz
 /libzip-1.7.0.tar.xz
+/libzip-1.7.1.tar.xz
diff --git a/0001-Restore-LIBZIP_VERSION_-MAJOR-MINOR-MICRO.patch b/0001-Restore-LIBZIP_VERSION_-MAJOR-MINOR-MICRO.patch
deleted file mode 100644
index 0b3d61c..0000000
--- a/0001-Restore-LIBZIP_VERSION_-MAJOR-MINOR-MICRO.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-
diff --git a/0002-Fix-previous-the-macros-are-expected-to-be-numbers.patch b/0002-Fix-previous-the-macros-are-expected-to-be-numbers.patch
deleted file mode 100644
index cc2da50..0000000
--- a/0002-Fix-previous-the-macros-are-expected-to-be-numbers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
-
diff --git a/libzip.spec b/libzip.spec
index 3d64779..e1aff0f 100644
--- a/libzip.spec
+++ b/libzip.spec
@@ -1,7 +1,7 @@
 %global with_tests     0%{!?_without_tests:1}
 
 Name:    libzip
-Version: 1.7.0
+Version: 1.7.1
 Release: 1%{?dist}
 Summary: C library for reading, creating, and modifying zip archives
 
@@ -9,9 +9,6 @@ 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
@@ -124,6 +121,9 @@ make check
 
 
 %changelog
+* Mon Jun 15 2020 Remi Collet <remi@remirepo.net> - 1.7.1-1
+- update to 1.7.1
+
 * 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
diff --git a/sources b/sources
index 4fcaa4a..af5938d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libzip-1.7.0.tar.xz) = 9c1632b4e0b4cfe22c5670d815bc8893d540226e3e64cf8cce7039a90bdc7048dedadb4804b151291e312c97bb384bd671e43021401c4c3e33a4e597972bc681
+SHA512 (libzip-1.7.1.tar.xz) = e924749274e5e45b83ba4bc961bfd299b9dd05829c1f42880a9814f942dbf7afe79aa1ea4e2b33d6db1dba1f7f948c0de40517f2ef90cc8725650b8cb88d9a14