From 39d398fdea2e3aebcf62aefd6047579d5e8caa82 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 15 Mar 2019 10:42:45 +0100 Subject: update to 0.0.5 drop patches merged upstream --- php-pecl-ahocorasick.spec | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'php-pecl-ahocorasick.spec') diff --git a/php-pecl-ahocorasick.spec b/php-pecl-ahocorasick.spec index ec1e7ee..c80ef84 100644 --- a/php-pecl-ahocorasick.spec +++ b/php-pecl-ahocorasick.spec @@ -23,16 +23,12 @@ Summary: Effective Aho-Corasick string pattern matching algorithm Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 0.0.4 +Version: 0.0.5 Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP and LGPLv3 URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -Patch0: https://github.com/ph4r05/php_aho_corasick/pull/17.patch -Patch1: https://github.com/ph4r05/php_aho_corasick/pull/18.patch -Patch2: https://github.com/ph4r05/php_aho_corasick/commit/5687f6975d8c18223f114d0d0f1246c505b6f101.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear @@ -98,9 +94,7 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .pr17 -%patch1 -p1 -b .pr18 -%patch2 -p1 -b .up +sed -e 's/0.0.4/%{version}/' -i src/php_ahocorasick.h # Sanity check, really often broken extver=$(sed -n '/#define PHP_AHOCORASICK_VERSION/{s/.* "//;s/".*$//;p}' src/php_ahocorasick.h) @@ -186,12 +180,6 @@ fi %check -%if "%{php_version}" > "7.3" -# See https://github.com/ph4r05/php_aho_corasick/pull/16 -rm ?TS/tests/test1.phpt -rm ?TS/tests/test3.phpt -%endif - cd NTS : Minimal load test for NTS extension %{__php} --no-php-ini \ @@ -240,6 +228,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Fri Mar 15 2019 Remi Collet - 0.0.5-1 +- update to 0.0.5 +- drop patches merged upstream + * Fri Mar 15 2019 Remi Collet - 0.0.4-1 - update to 0.0.4 - drop patch merged upstream -- cgit