From 67970660edb6db2870a59e36607841c698f003ac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 14 Jun 2020 08:33:20 +0200 Subject: update to 1.3.5 drop patch merged upstream --- 10.patch | 47 ------------------------------------------- PHPINFO | 11 ++++++++++ REFLECTION | 2 +- php-pecl-pcs.spec | 60 +++++++++++++++++++++++++------------------------------ 4 files changed, 39 insertions(+), 81 deletions(-) delete mode 100644 10.patch create mode 100644 PHPINFO diff --git a/10.patch b/10.patch deleted file mode 100644 index d33e5a4..0000000 --- a/10.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e1eadcf2e44cecbf2816290f1d4edb0a74767028 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Sun, 25 Jun 2017 06:52:52 +0200 -Subject: [PATCH] Fix test suite for php 7.2 - ---- - package.xml | 1 + - tests/autoload_001.phpt | 18 ++++++++++-------- - tests/autoload_002.phpt | 17 +++++++++++++++++ - 3 files changed, 28 insertions(+), 8 deletions(-) - create mode 100644 tests/autoload_002.phpt - -diff --git a/tests/autoload_001.phpt b/tests/autoload_001.phpt -index 96ef592..eeaa20a 100644 ---- a/tests/autoload_001.phpt -+++ b/tests/autoload_001.phpt -@@ -1,5 +1,7 @@ - --TEST-- - __autoload() is functional -+--SKIPIF-- -+= 70200) die("skip PHP < 7.2 only"); ?> - --FILE-- - -+===DONE=== -+--EXPECTF-- -+string(9) "undefined" -+===DONE=== diff --git a/PHPINFO b/PHPINFO new file mode 100644 index 0000000..c9da2cf --- /dev/null +++ b/PHPINFO @@ -0,0 +1,11 @@ + +pcs + +PHP Code Service => enabled +Version => 1.3.5 +File count => 4 + + Load mode +Autoloaded => 1 +Loaded at RINIT => 0 +Not loaded => 3 diff --git a/REFLECTION b/REFLECTION index bb9f80e..b77ab57 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #110 pcs version 1.3.3 ] { +Extension [ extension #89 pcs version 1.3.5 ] { - Dependencies { Dependency [ tokenizer (Required) ] diff --git a/php-pecl-pcs.spec b/php-pecl-pcs.spec index c5d2f2e..9258446 100644 --- a/php-pecl-pcs.spec +++ b/php-pecl-pcs.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-pcs # -# Copyright (c) 2013-2017 Remi Collet +# Copyright (c) 2013-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -23,16 +23,13 @@ Summary: PHP Code Service Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.3.3 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.3.5 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP -Group: Development/Languages -URL: http://pecl.php.net/package/%{pecl_name} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +URL: https://pecl.php.net/package/%{pecl_name} +Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz -Patch0: 10.patch - -BuildRequires: %{?scl_prefix}php-devel > 5.3 +BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-tokenizer BuildRequires: %{?scl_prefix}php-spl @@ -51,30 +48,18 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{rele %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "5.5" -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "5.6" -Obsoletes: php56u-pecl-%{pecl_name} <= %{version} -Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.0" -Obsoletes: php70u-pecl-%{pecl_name} <= %{version} -Obsoletes: php70w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -%endif %if "%{php_version}" > "7.2" Obsoletes: php72u-pecl-%{pecl_name} <= %{version} Obsoletes: php72w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.3" +Obsoletes: php73-pecl-%{pecl_name} <= %{version} +Obsoletes: php73w-pecl-%{pecl_name} <= %{version} +%endif +%if "%{php_version}" > "7.4" +Obsoletes: php74-pecl-%{pecl_name} <= %{version} +Obsoletes: php74w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -111,10 +96,9 @@ mv %{pecl_name}-%{version} NTS %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS -%{?_licensedir:cp pecl-compat/LICENSE LICENSE_pecl_compat} +find . -type f -exec chmod -x {} \; -sed -e 's/\r//' -i tests/autoload_001.phpt -%patch0 -p1 -b .pr10 +%{?_licensedir:cp pecl-compat/LICENSE LICENSE_pecl_compat} # Sanity check, really often broken extver=$(sed -n '/#define PHP_PCS_VERSION/{s/.* "//;s/".*$//;p}' php_pcs.h) @@ -186,7 +170,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -271,6 +255,16 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Sun Jun 14 2020 Remi Collet - 1.3.5-1 +- update to 1.3.5 +- drop patch merged upstream + +* Sat Jun 13 2020 Remi Collet - 1.3.4-1 +- update to 1.3.4 + +* Wed Dec 12 2018 Remi Collet - 1.3.3-4 +- cleanup + * Tue Jul 18 2017 Remi Collet - 1.3.3-3 - rebuild for PHP 7.2.0beta1 new API -- cgit