From 2bb6ae423b589fb579a34fb1e896c40e2ac75249 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 25 Jun 2017 08:17:51 +0200 Subject: add patch for 7.2 --- php-pecl-yaf.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'php-pecl-yaf.spec') diff --git a/php-pecl-yaf.spec b/php-pecl-yaf.spec index af4873a..78aa158 100644 --- a/php-pecl-yaf.spec +++ b/php-pecl-yaf.spec @@ -27,7 +27,7 @@ Version: 3.0.4 Release: 0.9.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %else -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz %endif License: PHP @@ -35,6 +35,8 @@ Group: Development/Languages URL: http://pecl.php.net/package/yaf Source1: %{pecl_name}.ini +Patch0: 358.patch + BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear BuildRequires: pcre-devel @@ -68,6 +70,10 @@ Obsoletes: php70w-pecl-%{pecl_name} <= %{version} 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 %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -99,6 +105,7 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .pr358 # Sanity check, really often broken extver=$(sed -n '/#define PHP_YAF_VERSION/{s/.*\t"//;s/".*$//;p}' php_yaf.h ) @@ -115,6 +122,8 @@ cp -pr NTS ZTS %build +%{?dtsenable} + cd NTS %{_bindir}/phpize %configure --with-php-config=%{_bindir}/php-config @@ -129,6 +138,8 @@ make %{?_smp_mflags} %install +%{?dtsenable} + # Install the NTS stuff make -C NTS install INSTALL_ROOT=%{buildroot} install -D -m 644 %{SOURCE1} %{buildroot}%{php_inidir}/%{ini_name} @@ -218,6 +229,10 @@ fi %changelog +* Sun Jun 25 2017 Remi Collet - 3.0.4-4 +- add patch for PHP 7.2 from + https://github.com/laruence/yaf/pull/358 + * Thu Dec 1 2016 Remi Collet - 3.0.4-3 - rebuild with PHP 7.1.0 GA -- cgit