summaryrefslogtreecommitdiffstats
path: root/php-pecl-zip.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-08-08 15:01:12 +0200
committerRemi Collet <fedora@famillecollet.com>2013-08-08 15:01:12 +0200
commit269860bee39fde0acce8f543b18f8ec64bb61cc0 (patch)
treeef5b62c50235de5975ae667c7314671a0cbf00e0 /php-pecl-zip.spec
parentca38c7a9452f9a4351ebd5d0a35bff4a05377d7d (diff)
php-pecl-zip: upstream patch
Diffstat (limited to 'php-pecl-zip.spec')
-rw-r--r--php-pecl-zip.spec11
1 files changed, 8 insertions, 3 deletions
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 ..