From 05f1846bd5c83644ef61366728f25e13b075e36b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 19 Dec 2013 14:51:13 +0100
Subject: [PATCH] update to 0.11.2

---
 .gitignore              |  1 +
 libzip-0.11-deref.patch | 26 --------------------------
 libzip.spec             | 18 ++++++++++--------
 sources                 |  2 +-
 4 files changed, 12 insertions(+), 35 deletions(-)
 delete mode 100644 libzip-0.11-deref.patch

diff --git a/.gitignore b/.gitignore
index fadae80..8ea9eb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ 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
diff --git a/libzip-0.11-deref.patch b/libzip-0.11-deref.patch
deleted file mode 100644
index 59f559a..0000000
--- a/libzip-0.11-deref.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ru libzip-0.11.1.orig/lib/zip_fclose.c libzip-0.11.1/lib/zip_fclose.c
---- libzip-0.11.1.orig/lib/zip_fclose.c	2013-08-08 11:01:26.000000000 +0200
-+++ libzip-0.11.1/lib/zip_fclose.c	2013-08-08 11:06:46.000000000 +0200
-@@ -48,14 +48,15 @@
-     if (zf->src)
- 	zip_source_free(zf->src);
- 
--    for (i=0; i<zf->za->nfile; i++) {
--	if (zf->za->file[i] == zf) {
--	    zf->za->file[i] = zf->za->file[zf->za->nfile-1];
--	    zf->za->nfile--;
--	    break;
-+	if (zf->za) {
-+		for (i=0; i<zf->za->nfile; i++) {
-+			if (zf->za->file[i] == zf) {
-+				zf->za->file[i] = zf->za->file[zf->za->nfile-1];
-+				zf->za->nfile--;
-+				break;
-+			}
-+		}
- 	}
--    }
--
-     ret = 0;
-     if (zf->error.zip_err)
- 	ret = zf->error.zip_err;
diff --git a/libzip.spec b/libzip.spec
index 0b10ef7..a26680f 100644
--- a/libzip.spec
+++ b/libzip.spec
@@ -2,8 +2,8 @@
 %define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9
 
 Name:    libzip
-Version: 0.11.1
-Release: 3%{?dist}
+Version: 0.11.2
+Release: 1%{?dist}
 Summary: C library for reading, creating, and modifying zip archives
 
 License: BSD
@@ -16,10 +16,6 @@ BuildRequires:  zlib-devel
 # to handle multiarch headers, ex from mysql-devel package
 Source1: zipconf.h
 
-# fix null deref in zip_fclose
-# http://hg.nih.at/libzip/rev/a2f3bb7896c0
-Patch0: libzip-0.11-deref.patch
-
 
 %description
 libzip is a C library for reading, creating, and modifying zip archives. Files
@@ -38,8 +34,6 @@ developing applications that use %{name}.
 %prep
 %setup -q
 
-%patch0 -p1 -b .deref
-
 # Avoid lib64 rpaths (FIXME: recheck this on newer releases)
 %if "%{_libdir}" != "/usr/lib"
 sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
@@ -73,6 +67,10 @@ ln -s ../%{_lib}/libzip/include/zipconf.h \
 %endif
 
 
+%check
+make check
+
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -95,6 +93,10 @@ ln -s ../%{_lib}/libzip/include/zipconf.h \
 
 
 %changelog
+* Thu Dec 19 2013 Remi Collet <remi@fedoraproject.org> - 0.11.2-1
+- update to 0.11.2
+- run test during build
+
 * Thu Oct 24 2013 Remi Collet <remi@fedoraproject.org> - 0.11.1-3
 - replace php patch with upstream one
 
diff --git a/sources b/sources
index d8cd586..3188a4d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87d5ec3629f6ad2a4b01ad961e7f0c19  libzip-0.11.1.tar.xz
+44c99b67dca34707b5728e5f8434fe91  libzip-0.11.2.tar.xz