add upstream patch for libzip 1.2.0

This commit is contained in:
Remi Collet 2017-02-28 15:56:50 +01:00
parent a12d754041
commit 2fee7ad4ce
2 changed files with 23 additions and 0 deletions

View File

@ -20,6 +20,8 @@ URL: http://pecl.php.net/package/zip
Source: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
Patch0: %{pecl_name}-upstream.patch
BuildRequires: php-devel
BuildRequires: pkgconfig(libzip) >= 1.0.0
BuildRequires: zlib-devel
@ -50,6 +52,7 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd %{pecl_name}-%{version}
%patch0 -p1 -b .upstream
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_ZIP_VERSION/{s/.* "//;s/".*$//;p}' php5/php_zip.h)

20
zip-upstream.patch Normal file
View File

@ -0,0 +1,20 @@
From 029f047293f9bb6f871f5f4800a67d692c182592 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 19 Feb 2017 16:59:46 +0100
Subject: [PATCH] fix test for libzip 1.2.0
---
tests/bug70322.phpt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/bug70322.phpt b/tests/bug70322.phpt
index a9b4915..b089e30 100644
--- a/tests/bug70322.phpt
+++ b/tests/bug70322.phpt
@@ -25,5 +25,5 @@ var_dump($zip->close());
@unlink(__DIR__ . '/bug70322.zip');
?>
--EXPECTF--
-Warning: ZipArchive::close(): Read error: No such file or directory in %s%ebug70322.php on line %d
+Warning: ZipArchive::close(): %s: No such file or directory in %s%ebug70322.php on line %d
bool(false)