diff options
Diffstat (limited to 'php-pecl-http.spec')
| -rw-r--r-- | php-pecl-http.spec | 58 |
1 files changed, 23 insertions, 35 deletions
diff --git a/php-pecl-http.spec b/php-pecl-http.spec index a2b7a3a..f7e34ea 100644 --- a/php-pecl-http.spec +++ b/php-pecl-http.spec @@ -32,25 +32,26 @@ %global proj_name pecl_http %global pecl_name http %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -# after 40-propro 40-raphf +# after 40-raphf %global ini_name 50-%{pecl_name}.ini %ifarch %{arm} # Test suite disabled because of erratic results on slow ARM (timeout) -%global with_tests 0%{?_with_tests:1} +%bcond_with tests %else -%global with_tests 0%{!?_without_tests:1} +%bcond_without tests %endif -%global upstream_version 3.2.3 -#global upstream_prever RC1 +%global upstream_version 4.0.0 +%global upstream_prever beta1 +%global upstream_lower beta1 Name: %{?sub_prefix}php-pecl-http -Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} +Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} %if 0%{?gh_date:1} -Release: 0.7.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +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: 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: https://pecl.php.net/get/%{proj_name}-%{upstream_version}%{?upstream_prever}.tgz %endif Summary: Extended HTTP support @@ -62,8 +63,7 @@ URL: https://pecl.php.net/package/pecl_http Source1: %{proj_name}.ini BuildRequires: %{?dtsprefix}gcc -BuildRequires: %{?scl_prefix}php-devel >= 7 -BuildRequires: %{?scl_prefix}php-hash +BuildRequires: %{?scl_prefix}php-devel >= 8 BuildRequires: %{?scl_prefix}php-spl BuildRequires: %{?scl_prefix}php-pear BuildRequires: pcre-devel @@ -71,7 +71,6 @@ BuildRequires: zlib-devel >= 1.2.0.4 BuildRequires: curl-devel >= 7.18.2 # Use same version than PHP to ensure we use libicu-last (EL 6) BuildRequires: libicu-devel >= 50 -BuildRequires: %{?scl_prefix}php-pecl-propro-devel >= 2 BuildRequires: %{?scl_prefix}php-pecl-raphf-devel >= 2 BuildRequires: pkgconfig(libevent) >= 2 # only needed in F27+ @@ -82,10 +81,8 @@ BuildRequires: brotli-devel >= 1.0 Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} -Requires: %{?scl_prefix}php-hash%{?_isa} Requires: %{?scl_prefix}php-spl%{?_isa} -Requires: %{?scl_prefix}php-pecl(propro)%{?_isa} >= 1.0.0 -Requires: %{?scl_prefix}php-pecl(raphf)%{?_isa} >= 1.1.0 +Requires: %{?scl_prefix}php-pecl(raphf)%{?_isa} >= 2 Obsoletes: %{?scl_prefix}php-pecl-http1 < 2 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} @@ -102,22 +99,9 @@ Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-http <= %{version} -Obsoletes: php71w-pecl-http <= %{version} -%endif -%if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-http <= %{version} -Obsoletes: php72w-pecl-http <= %{version} -%endif -%if "%{php_version}" > "7.3" Obsoletes: php73-pecl-http <= %{version} -Obsoletes: php73w-pecl-http <= %{version} -%endif -%if "%{php_version}" > "7.4" Obsoletes: php74-pecl-http <= %{version} -Obsoletes: php74w-pecl-http <= %{version} -%endif +Obsoletes: php80-pecl-http <= %{version} %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -272,7 +256,7 @@ fi # Shared needed extensions modules="" -for mod in hash propro raphf; do +for mod in raphf; do if [ -f %{php_extdir}/${mod}.so ]; then modules="$modules -d extension=${mod}.so" fi @@ -284,11 +268,7 @@ done --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ --modules | grep %{pecl_name} -%if %{with_tests} -: ignore tests with erratic results -#rm ?TS/tests/client022.phpt -#rm ?TS/tests/client027.phpt - +%if %{with tests} : Upstream test suite NTS extension cd NTS TEST_PHP_EXECUTABLE=%{__php} \ @@ -304,7 +284,7 @@ NO_INTERACTION=1 \ --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ --modules | grep %{pecl_name} -%if %{with_tests} +%if %{with tests} : Upstream test suite ZTS extension cd ../ZTS TEST_PHP_EXECUTABLE=%{__ztsphp} \ @@ -358,6 +338,14 @@ fi %changelog +* Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 4.0.0~beta1-2 +- rebuild for PHP 8.0.0RC1 + +* Wed Sep 23 2020 Remi Collet <remi@remirepo.net> - 4.0.0~beta1-1 +- update to 4.0.0beta1 +- raise dependency on PHP 8.0 +- drop dependency on propro extension + * Tue Oct 29 2019 Remi Collet <remi@remirepo.net> - 3.2.3-1 - update to 3.2.3 |