From ba941a7b925073f32c44ab49970c4be74d68e14c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 28 Jan 2016 14:43:02 +0100
Subject: [PATCH] - update to 1.1 - new ziptool command - add fix for undefined
 optopt in ziptool.c (upstream)

ABI/API check: compatible
http://rpms.remirepo.net/compat_reports/libzip/1.0.1_to_1.1/compat_report.html
---
 .gitignore         |  2 ++
 libzip-build.patch | 11 +++++++++++
 libzip.spec        | 14 ++++++++++++--
 sources            |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 libzip-build.patch

diff --git a/.gitignore b/.gitignore
index 74d2ce8..9145ad8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
+clog
 libzip-0.9.3.tar.bz2
 /libzip-0.10.tar.bz2
 /libzip-0.10.1.tar.bz2
 /libzip-0.11.1.tar.xz
 /libzip-0.11.2.tar.xz
 /libzip-1.0.1.tar.xz
+/libzip-1.1.tar.xz
diff --git a/libzip-build.patch b/libzip-build.patch
new file mode 100644
index 0000000..5e25b4e
--- /dev/null
+++ b/libzip-build.patch
@@ -0,0 +1,11 @@
+diff -up src/ziptool.c.old src/ziptool.c
+--- ./src/ziptool.c.old	2016-01-28 14:19:37.026356371 +0100
++++ ./src/ziptool.c	2016-01-28 14:19:43.394384005 +0100
+@@ -53,6 +53,7 @@
+ #include "compat.h"
+ 
+ zip_source_t *source_hole_create(const char *, int flags, zip_error_t *);
++extern int optopt;
+ 
+ typedef enum {
+     SOURCE_TYPE_NONE,
diff --git a/libzip.spec b/libzip.spec
index 252b97c..525d7ee 100644
--- a/libzip.spec
+++ b/libzip.spec
@@ -2,8 +2,8 @@
 %global with_tests     %{?_without_tests:0}%{!?_without_tests:1}
 
 Name:    libzip
-Version: 1.0.1
-Release: 3%{?dist}
+Version: 1.1
+Release: 1%{?dist}
 Summary: C library for reading, creating, and modifying zip archives
 
 License: BSD
@@ -12,6 +12,9 @@ Source0: http://www.nih.at/libzip/libzip-%{version}.tar.xz
 # to handle multiarch headers, ex from mysql-devel package
 Source1: zipconf.h
 
+# fix undefined optopt
+Patch0:  %{name}-build.patch
+
 BuildRequires:  zlib-devel
 # Needed to run the test suite
 # find regress/ -type f | /usr/lib/rpm/perl.req
@@ -51,6 +54,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 The %{name}-tools package provides command line tools split off %{name}:
 - zipcmp
 - zipmerge
+- ziptool
 
 
 %prep
@@ -108,6 +112,7 @@ make check
 %files tools
 %{_bindir}/zipcmp
 %{_bindir}/zipmerge
+%{_bindir}/ziptool
 %{_mandir}/man1/zip*
 
 %files devel
@@ -124,6 +129,11 @@ make check
 
 
 %changelog
+* Thu Jan 28 2016 Remi Collet <remi@fedoraproject.org> - 1.1-1
+- update to 1.1
+- new ziptool command
+- add fix for undefined optopt in ziptool.c (upstream)
+
 * Fri Dec  4 2015 Remi Collet <remi@fedoraproject.org> - 1.0.1-3
 - fix libzip-tools summary #1288424
 
diff --git a/sources b/sources
index f76fd3c..108844e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e2371fc6f04a46efdaf8cbf4118ffafd  libzip-1.0.1.tar.xz
+e5d856b42a329e8efbcdfd9046b22744  libzip-1.1.tar.xz