From 62819c03c515797898c1ab6d36021d5e5ed7dba8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 23 Jun 2017 14:31:32 +0200 Subject: add upstreampatch for 7.2 --- php-pecl-http.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'php-pecl-http.spec') diff --git a/php-pecl-http.spec b/php-pecl-http.spec index bf9ceb8..3fcacab 100644 --- a/php-pecl-http.spec +++ b/php-pecl-http.spec @@ -43,7 +43,7 @@ Version: 3.1.0 Release: 0.2.%{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: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: http://pecl.php.net/get/%{proj_name}-%{version}%{?prever}.tgz %endif Summary: Extended HTTP support @@ -55,6 +55,8 @@ URL: http://pecl.php.net/package/pecl_http # From http://www.php.net/manual/en/http.configuration.php Source1: %{proj_name}.ini +Patch0: 1b1435c135c69d81b47f1f0662633867c5c289b5.patch + BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-hash BuildRequires: %{?scl_prefix}php-spl @@ -163,6 +165,8 @@ mv %{proj_name}-%{version}%{?prever} NTS %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS +%patch0 -p1 -b .upstream + extver=$(sed -n '/#define PHP_PECL_HTTP_VERSION/{s/.* "//;s/".*$//;p}' php_http.h) if test "x${extver}" != "x%{version}%{?prever}%{?gh_date:dev}"; then : Error: Upstream HTTP version is now ${extver}, expecting %{version}%{?prever}%{?gh_date:dev}. @@ -337,6 +341,9 @@ fi %changelog +* Fri Jun 23 2017 Remi Collet - 3.1.0-5 +- add upstream patch for 7.2 + * Tue May 9 2017 Remi Collet - 3.1.0-4 - drop dependency on libidn, only use libicu, #1449142 -- cgit