From 5944312350c26bbba8ff9ec6f8432b6a33f94f8b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 1 Mar 2016 15:38:17 +0100
Subject: [PATCH] v1.13.2

---
 .gitignore        |  1 +
 php-pecl-zip.spec | 30 ++++++++++++++----------------
 sources           |  2 +-
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 13ab49e..0c24d65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ php-pecl-zip.spec~
 /zip-1.12.5.tgz
 /zip-1.13.0.tgz
 /zip-1.13.1.tgz
+/zip-1.13.2.tgz
diff --git a/php-pecl-zip.spec b/php-pecl-zip.spec
index fc0e3ec..4a17c20 100644
--- a/php-pecl-zip.spec
+++ b/php-pecl-zip.spec
@@ -1,23 +1,19 @@
 # Fedora spec file for php-pecl-zip
 #
-# Copyright (c) 2013-2015 Remi Collet
+# Copyright (c) 2013-2016 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global pecl_name      zip
-%if "%{php_version}" < "5.6"
-%global ini_name  %{pecl_name}.ini
-%else
+%global pecl_name zip
 %global ini_name  40-%{pecl_name}.ini
-%endif
 
 Summary:      A ZIP archive management extension
 Summary(fr):  Une extension de gestion des ZIP
 Name:         php-pecl-zip
-Version:      1.13.1
-Release:      3%{?dist}
+Version:      1.13.2
+Release:      1%{?dist}
 License:      PHP
 Group:        Development/Languages
 URL:          http://pecl.php.net/package/zip
@@ -49,7 +45,9 @@ Zip est une extension pour créer et lire les archives au format ZIP.
 %setup -c -q
 
 # Don't install/register tests
-sed -e 's/role="test"/role="src"/' -i package.xml
+sed -e 's/role="test"/role="src"/' \
+    %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+    -i package.xml
 
 cd %{pecl_name}-%{version}
 
@@ -113,9 +111,6 @@ done
 
 
 %check
-# Ignore failed test due to change in 5.6.18 (security fix)
-rm %{pecl_name}-*/tests/stream_meta_data.phpt
-
 cd %{pecl_name}-%{version}
 : minimal load test of NTS extension
 %{_bindir}/php --no-php-ini \
@@ -128,8 +123,7 @@ TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
 REPORT_EXIT_STATUS=1 \
 NO_INTERACTION=1 \
 TEST_PHP_EXECUTABLE=%{_bindir}/php \
-%{_bindir}/php \
-   run-tests.php
+%{_bindir}/php -n run-tests.php
 
 cd ../%{pecl_name}-zts
 : minimal load test of ZTS extension
@@ -143,11 +137,11 @@ TEST_PHP_ARGS="-n -d extension_dir=$PWD/modules -d extension=%{pecl_name}.so" \
 REPORT_EXIT_STATUS=1 \
 NO_INTERACTION=1 \
 TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
-%{_bindir}/zts-php \
-   run-tests.php
+%{_bindir}/zts-php -n run-tests.php
 
 
 %files
+%license %{pecl_name}-%{version}/LICENSE
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -159,6 +153,10 @@ TEST_PHP_EXECUTABLE=%{_bindir}/zts-php \
 
 
 %changelog
+* Tue Mar  1 2016 Remi Collet <remi@fedoraproject.org> - 1.13.2-1
+- Update to 1.13.2
+- fix license management
+
 * Wed Feb 10 2016 Remi Collet <remi@fedoraproject.org> - 1.13.1-3
 - drop scriptlets (replaced file triggers in php-pear)
 - ignore 1 test (change in php, FTBFS detected by Koschei)
diff --git a/sources b/sources
index 1970053..b22ad48 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-465d84c77c740473c025e48262667b85  zip-1.13.1.tgz
+e4a8137658ef04b6c8d446a14ec8b025  zip-1.13.2.tgz