From a0517808558ffde93a510cb60d14039ca520cc67 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Jun 2015 09:14:32 +0200 Subject: php-pecl-hprose: allow build against rh-php56 (as more-php56) --- php-pecl-hprose.spec | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'php-pecl-hprose.spec') diff --git a/php-pecl-hprose.spec b/php-pecl-hprose.spec index ae8aae6..ddde849 100644 --- a/php-pecl-hprose.spec +++ b/php-pecl-hprose.spec @@ -6,6 +6,14 @@ # # Please, preserve the changelog entries # +%if 0%{?scl:1} +%if "%{scl}" == "rh-php56" +%global sub_prefix more-php56- +%else +%global sub_prefix %{scl_prefix} +%endif +%endif + %{?scl: %scl_package php-pecl-hprose} %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} %{!?__pecl: %global __pecl %{_bindir}/pecl} @@ -21,14 +29,17 @@ %endif Summary: Hprose for PHP -Name: %{?scl_prefix}php-pecl-%{pecl_name} +Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.5.4 -Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: MIT Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz +# https://github.com/hprose/hprose-pecl/pull/10 +Patch0: %{pecl_name}-pr10.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-devel > 5.3 BuildRequires: %{?scl_prefix}php-pear @@ -84,7 +95,7 @@ languages. This project is the implementation of Hprose for PHP. -Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection}. +Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl})}. %prep @@ -96,6 +107,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .pr10 + # Sanity check, really often broken extver=$(sed -n '/#define PHP_HPROSE_VERSION/{s/.* "//;s/".*$//;p}' php_hprose.h) if test "x${extver}" != "x%{version}"; then @@ -239,6 +252,9 @@ rm -rf %{buildroot} %changelog +* Wed Jun 24 2015 Remi Collet - 1.5.4-2 +- allow build against rh-php56 (as more-php56) + * Sun May 24 2015 Remi Collet - 1.5.4-1 - Update to 1.5.4 -- cgit