From 9eefc1eef2121885ab58b56acc8211ea1d08a80a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 25 Aug 2014 21:59:14 +0200 Subject: php-pecl-* improve SCL build for 5.6 (wip) --- php-pecl-xdebug.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/php-pecl-xdebug.spec b/php-pecl-xdebug.spec index ccbe076..6b12a81 100644 --- a/php-pecl-xdebug.spec +++ b/php-pecl-xdebug.spec @@ -30,7 +30,7 @@ Name: %{?scl_prefix}php-pecl-xdebug Summary: PECL package for debugging PHP scripts Version: 2.2.5 -Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} %if 0%{?gitver:1} Source0: https://github.com/%{pecl_name}/%{pecl_name}/archive/%{commit}/%{pecl_name}-%{version}-%{gitver}.tar.gz %else @@ -59,16 +59,19 @@ Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl(Xdebug) = %{version} Provides: %{?scl_prefix}php-pecl(Xdebug)%{?_isa} = %{version} -%if "%{?vendor}" == "Remi Collet" +%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} # Other third party repo stuff Obsoletes: php53-pecl-%{pecl_name} Obsoletes: php53u-pecl-%{pecl_name} Obsoletes: php54-pecl-%{pecl_name} +Obsoletes: php54w-pecl-%{pecl_name} %if "%{php_version}" > "5.5" Obsoletes: php55u-pecl-%{pecl_name} +Obsoletes: php55w-pecl-%{pecl_name} %endif %if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-%{pecl_name} +Obsoletes: php56w-pecl-%{pecl_name} %endif %endif @@ -235,8 +238,9 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc %{pecl_docdir}/%{pecl_name} %config(noreplace) %{php_inidir}/%{ini_name} -%{php_extdir}/%{pecl_name}.so %{_bindir}/debugclient + +%{php_extdir}/%{pecl_name}.so %{pecl_xmldir}/%{name}.xml %if %{with_zts} @@ -246,6 +250,9 @@ rm -rf %{buildroot} %changelog +* Mon Aug 25 2014 Remi Collet - 2.2.5-2 +- improve SCL build + * Wed Apr 30 2014 Remi Collet - 2.2.5-1 - Update to 2.2.5 (stable) -- cgit