From 269860bee39fde0acce8f543b18f8ec64bb61cc0 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 8 Aug 2013 15:01:12 +0200
Subject: php-pecl-zip: upstream patch

---
 php-pecl-zip.spec | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'php-pecl-zip.spec')

diff --git a/php-pecl-zip.spec b/php-pecl-zip.spec
index 2573c3e..1237d93 100644
--- a/php-pecl-zip.spec
+++ b/php-pecl-zip.spec
@@ -21,8 +21,11 @@ URL:          http://pecl.php.net/package/zip
 
 Source:       http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
+# https://github.com/pierrejoye/php_zip/pull/3 (merged)
+# Cleanups and fix build warnings
+Patch0:       zip-git.patch
 # use system libzip 0.11 instead of bundled copy
-Patch0:       zip-systemlibzip.patch
+Patch1:       zip-systemlibzip.patch
 
 BuildRequires: php-devel
 %if %{with_libzip}
@@ -60,8 +63,10 @@ Zip est une extension pour créer et lire les archives au format ZIP.
 cd %{pecl_name}-%{version}
 
 %if %{with_libzip}
-%patch0 -p1 -b .systemlibzip
-rm -rf lib
+%patch0 -p1 -b .git
+%patch1 -p1 -b .systemlibzip
+# delete bundled libzip to ensure it is not used (except zipint.h)
+rm lib/*.c
 %endif
 
 cd ..
-- 
cgit