diff options
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-xdebug.spec | 27 |
2 files changed, 16 insertions, 13 deletions
@@ -1,4 +1,4 @@ -Extension [ <persistent> extension #192 xdebug version 2.6.0 ] { +Extension [ <persistent> extension #198 xdebug version 2.7.0alpha1 ] { - INI { Entry [ xdebug.auto_trace <ALL> ] diff --git a/php-pecl-xdebug.spec b/php-pecl-xdebug.spec index f5ae622..718ae26 100644 --- a/php-pecl-xdebug.spec +++ b/php-pecl-xdebug.spec @@ -19,35 +19,32 @@ %global pecl_name xdebug %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global gh_commit 61690fbc6e7991f12c6a36bc72db9e0a145406e0 +%global gh_commit 4981b8329b1fc1b84fb680d9f70737b860cbdcc1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20171202 %global with_tests 0%{!?_without_tests:1} -#global prever RC2 +%global upstream_version 2.7.0 +%global upstream_prever alpha1 # XDebug should be loaded after opcache %global ini_name 15-%{pecl_name}.ini Name: %{?scl_prefix}php-pecl-xdebug Summary: PECL package for debugging PHP scripts -Version: 2.6.0 -%if 0%{?prever:1} -Release: 0.12.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -%else +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} %if 0%{?gh_date:1} Release: 0.8.%{gh_date}.%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %endif -%endif # The Xdebug License, version 1.01 # (Based on "The PHP License", version 3.0) License: BSD -Group: Development/Languages URL: http://xdebug.org/ -Source0: https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{version}%{?prever}-%{gh_short}.tar.gz +Source0: https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz +BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-simplexml @@ -137,8 +134,8 @@ mv NTS/package.xml . cd NTS # Check extension version ver=$(sed -n '/XDEBUG_VERSION/{s/.* "//;s/".*$//;p}' php_xdebug.h) -if test "$ver" != "%{version}%{?prever}%{?gh_date:-dev}"; then - : Error: Upstream XDEBUG_VERSION version is ${ver}, expecting %{version}%{?prever}%{?gh_date:-dev}. +if test "$ver" != "%{upstream_version}%{?upstream_prever}%{?gh_date:-dev}"; then + : Error: Upstream XDEBUG_VERSION version is ${ver}, expecting %{upstream_version}%{?upstream_perver}%{?gh_date:-dev}. exit 1 fi @@ -240,6 +237,9 @@ done %if %{with_tests} cd NTS +# TODO Need investigation +rm tests/bug00998-ipv6_localhost.phpt + : Upstream test suite NTS extension # bug00886 is marked as slow as it uses a lot of disk space SKIP_SLOW_TESTS=1 \ @@ -253,7 +253,7 @@ REPORT_EXIT_STATUS=1 \ %endif -%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 @@ -289,6 +289,9 @@ fi %changelog +* Mon Apr 2 2018 Remi Collet <remi@remirepo.net> - 2.7.0~alpha1-1 +- update to 2.7.0alpha1 + * Tue Jan 30 2018 Remi Collet <remi@remirepo.net> - 2.6.0-1 - update to 2.6.0 (stable) |