diff options
| author | Remi Collet <remi@remirepo.net> | 2018-12-11 12:20:19 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-12-11 12:20:19 +0100 |
| commit | 5e81e074b68c708a1a016053257650d9c07f33ba (patch) | |
| tree | 34c5149782748f818d3ed1855c06ca024eaa92c5 | |
| parent | 33316e8ecba86af45532daad1187382097000183 (diff) | |
update to 1.2.3
drop patch merged upstream
| -rw-r--r-- | 7.patch | 36 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-yaz.spec | 12 |
4 files changed, 8 insertions, 44 deletions
diff --git a/7.patch b/7.patch deleted file mode 100644 index 630260e..0000000 --- a/7.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 010fef7b3941cdd24ceaaac78f3db9732539e0d3 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 27 Jun 2018 13:57:51 +0200 -Subject: [PATCH] fix for PHP 7.3 API changes, and array_init always succeeds - ---- - php_yaz.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/php_yaz.c b/php_yaz.c -index 5a4ba0b..e0d5f6d 100644 ---- a/php_yaz.c -+++ b/php_yaz.c -@@ -832,8 +832,8 @@ PHP_FUNCTION(yaz_hits) - } else { - WRONG_PARAM_COUNT; - } -- if (searchresult && array_init(searchresult) == FAILURE) { -- RETURN_FALSE; -+ if (searchresult) { -+ array_init(searchresult); - } - get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, id, &p); - -@@ -1923,9 +1923,8 @@ PHP_FUNCTION(yaz_scan_result) - } - - array_init(return_value); -- -- if (pval_opt && array_init(pval_opt) == FAILURE) { -- RETURN_FALSE; -+ if (pval_opt) { -+ array_init(pval_opt); - } - - get_assoc(INTERNAL_FUNCTION_PARAM_PASSTHRU, pval_id, &p); @@ -2,6 +2,6 @@ yaz YAZ Support => enabled -PHP/YAZ Version => 1.2.2 +PHP/YAZ Version => 1.2.3 YAZ Version => 5.14.11 Compiled with YAZ version => 5.14.11 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #166 yaz version 1.2.2 ] { +Extension [ <persistent> extension #177 yaz version 1.2.3 ] { - INI { Entry [ yaz.max_links <ALL> ] diff --git a/php-pecl-yaz.spec b/php-pecl-yaz.spec index 9f32e1a..e2a5531 100644 --- a/php-pecl-yaz.spec +++ b/php-pecl-yaz.spec @@ -23,14 +23,12 @@ Summary: Z39.50/SRU client Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.2.2 -Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Version: 1.2.3 +Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: BSD URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -Patch0: https://patch-diff.githubusercontent.com/raw/indexdata/phpyaz/pull/7.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -107,8 +105,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .pr7 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_YAZ_VERSION/{s/.* "//;s/".*$//;p}' php_yaz.h) if test "x${extver}" != "x%{version}"; then @@ -245,6 +241,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Tue Dec 11 2018 Remi Collet <remi@remirepo.net> - 1.2.3-1 +- update to 1.2.3 +- drop patch merged upstream + * Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 1.2.2-4 - rebuild for 7.3.0beta2 new ABI |