From 324248940b4457c7ca2cd2e13a917e19a52bd567 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 28 Jan 2016 19:20:59 +0100
Subject: libzip-last 1.1

---
 libzip-build.patch | 11 +++++++++++
 libzip.spec        | 16 ++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 libzip-build.patch

diff --git a/libzip-build.patch b/libzip-build.patch
new file mode 100644
index 0000000..5736b17
--- /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 ec70cf8..60db008 100644
--- a/libzip.spec
+++ b/libzip.spec
@@ -26,8 +26,8 @@ Name:    %{libname}-last
 %else
 Name:    %{libname}
 %endif
-Version: 1.0.1
-Release: 3%{?dist}
+Version: 1.1
+Release: 1%{?dist}
 Group:   System Environment/Libraries
 Summary: C library for reading, creating, and modifying zip archives
 
@@ -37,6 +37,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:  %{libname}-build.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  zlib-devel
 # Needed to run the test suite
@@ -97,11 +100,14 @@ Obsoletes: %{libname}-last-tools <= %{version}
 The %{name}-tools package provides command line tools split off %{name}:
 - zipcmp
 - zipmerge
+- ziptool
 
 
 %prep
 %setup -q -n %{libname}-%{version}
 
+%patch0 -p0 -b .build
+
 # Avoid lib64 rpaths (FIXME: recheck this on newer releases)
 %if "%{_libdir}" != "/usr/lib"
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
@@ -157,6 +163,7 @@ make check
 %defattr(-,root,root,-)
 %{_bindir}/zipcmp
 %{_bindir}/zipmerge
+%{_bindir}/ziptool
 %{_mandir}/man1/zip*
 
 %files devel
@@ -174,6 +181,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)
+
 * Thu Jan 14 2016 Remi Collet <remi@fedoraproject.org> - 1.0.1-3
 - libzip obsoletes libzip-last
 
-- 
cgit