summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-01-17 09:59:59 +0100
committerRemi Collet <remi@remirepo.net>2019-01-17 09:59:59 +0100
commitf824380068c38db7377720feabb8a025f00f733c (patch)
treee7261a1c062c7510e328964d9e11a36e227f7ec5
parentc49544b79d2a6ca23342210626c4519d80c318a6 (diff)
fix SCL dependency
-rw-r--r--php-pecl-xdebug.spec13
1 files changed, 10 insertions, 3 deletions
diff --git a/php-pecl-xdebug.spec b/php-pecl-xdebug.spec
index b7aef95..aad6295 100644
--- a/php-pecl-xdebug.spec
+++ b/php-pecl-xdebug.spec
@@ -3,7 +3,7 @@
#
# Fedora spec file for php-pecl-xdebug
#
-# Copyright (c) 2010-2018 Remi Collet
+# Copyright (c) 2010-2019 Remi Collet
# Copyright (c) 2006-2009 Christopher Stone
#
# License: MIT
@@ -35,7 +35,7 @@ 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;')}}
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
%endif
# The Xdebug License, version 1.01
@@ -53,7 +53,7 @@ BuildRequires: %{?scl_prefix}php-simplexml
BuildRequires: libedit-devel
BuildRequires: libtool
%if %{with_tests}
-BuildRequires: php-soap
+BuildRequires: %{?scl_prefix}php-soap
%endif
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
@@ -250,6 +250,10 @@ done
%if %{with_tests}
cd NTS
+: Ignore test failing with recent version
+rm tests/bug01195-php71.phpt
+rm tests/bug01210-php71.phpt
+rm tests/bug01486-001.phpt
: Upstream test suite NTS extension
# bug00886 is marked as slow as it uses a lot of disk space
@@ -300,6 +304,9 @@ fi
%changelog
+* Thu Jan 17 2019 Remi Collet <remi@remirepo.net> - 2.7.0~beta1-2
+- fix SCL dependency
+
* Fri Sep 21 2018 Remi Collet <remi@remirepo.net> - 2.7.0~beta1-1
- update to 2.7.0beta1
- add link to documentation in description and configuration file