From a967ec1ab12f53031cf393684b2faa888afd68b6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 Jun 2018 17:50:42 +0200 Subject: add upstream patches for PHP 7.3 --- php-pecl-http.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'php-pecl-http.spec') diff --git a/php-pecl-http.spec b/php-pecl-http.spec index 6142e67..34593d5 100644 --- a/php-pecl-http.spec +++ b/php-pecl-http.spec @@ -50,7 +50,7 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 0.3.%{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: 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;')}} Source0: http://pecl.php.net/get/%{proj_name}-%{upstream_version}%{?upstream_prever}.tgz %endif Summary: Extended HTTP support @@ -61,6 +61,9 @@ URL: http://pecl.php.net/package/pecl_http # From http://www.php.net/manual/en/http.configuration.php Source1: %{proj_name}.ini +Patch0: https://github.com/m6w6/ext-http/commit/512f733beac73f37ba4acbcf730ebc6c6de849b6.patch +Patch1: https://github.com/m6w6/ext-http/commit/377d576a6e68def5708cf1ffcd3c233c4dddf356.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-hash @@ -172,6 +175,8 @@ mv %{proj_name}-%{upstream_version}%{?upstream_prever} NTS %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS +%patch0 -p1 -b .up0 +%patch1 -p1 -b .up1 extver=$(sed -n '/#define PHP_PECL_HTTP_VERSION/{s/.* "//;s/".*$//;p}' php_http.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}%{?gh_date:dev}"; then @@ -359,6 +364,9 @@ fi %changelog +* Tue Jun 26 2018 Remi Collet - 3.2.0~RC1-2 +- add upstream patches for PHP 7.3 + * Tue Apr 10 2018 Remi Collet - 3.2.0~RC1-1 - update to 3.2.0RC1 - enable brotli compression support on F28+ -- cgit