diff options
| author | Remi Collet <remi@remirepo.net> | 2021-08-04 16:18:11 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2021-08-04 16:18:11 +0200 |
| commit | 8cfb36920a0d73d833b9e653d49daacf56b3eeb5 (patch) | |
| tree | dbdb6ad1bb6e546bcfc71d5693a7485bba99a016 /php-pecl-http.spec | |
| parent | 7f4c62e4c6abd83353628799b910c315a7725aaa (diff) | |
add fix for 8.1.0beta2 from upstream and from
https://github.com/m6w6/ext-http/pull/118
Diffstat (limited to 'php-pecl-http.spec')
| -rw-r--r-- | php-pecl-http.spec | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/php-pecl-http.spec b/php-pecl-http.spec index a7e3788..7ecf562 100644 --- a/php-pecl-http.spec +++ b/php-pecl-http.spec @@ -46,7 +46,7 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} Release: 0.8.%{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: https://pecl.php.net/get/%{proj_name}-%{upstream_version}%{?upstream_prever}.tgz %endif Summary: Extended HTTP support @@ -57,6 +57,8 @@ URL: https://pecl.php.net/package/pecl_http # From http://www.php.net/manual/en/http.configuration.php Source1: %{proj_name}.ini +Patch0: %{proj_name}-php81.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 8 @@ -146,6 +148,9 @@ mv %{proj_name}-%{upstream_version}%{?upstream_prever} NTS %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS +%if "%{php_version}" > "8.1" +%patch0 -p1 +%endif 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 : Error: Upstream HTTP version is now ${extver}, expecting %{upstream_version}%{?upstream_prever}%{?gh_date:dev}. @@ -332,6 +337,10 @@ fi %changelog +* Wed Aug 4 2021 Remi Collet <remi@remirepo.net> - 4.1.0-5 +- add fix for 8.1.0beta2 from upstream and from + https://github.com/m6w6/ext-http/pull/118 + * Mon Jul 23 2021 Remi Collet <remi@remirepo.net> - 4.1.0-4 - ignore 2 more tests failing with libcurl 7.77 |