diff --git a/php-pecl-zip.spec b/php-pecl-zip.spec index d186a88..f349662 100644 --- a/php-pecl-zip.spec +++ b/php-pecl-zip.spec @@ -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) diff --git a/zip-upstream.patch b/zip-upstream.patch new file mode 100644 index 0000000..2c7842c --- /dev/null +++ b/zip-upstream.patch @@ -0,0 +1,20 @@ +From 029f047293f9bb6f871f5f4800a67d692c182592 Mon Sep 17 00:00:00 2001 +From: Remi Collet +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)