diff options
| -rw-r--r-- | php-pecl-http.spec | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/php-pecl-http.spec b/php-pecl-http.spec index f68c0fc..17aa5d4 100644 --- a/php-pecl-http.spec +++ b/php-pecl-http.spec @@ -22,6 +22,8 @@ %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner m6w6 %global gh_project ext-http +%global pie_vend m6w6 +%global pie_proj ext-http # The project is pecl_http but the extension is only http %global proj_name pecl_http %global pecl_name http @@ -37,7 +39,7 @@ Name: %{?scl_prefix}php-pecl-http Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 7%{?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 Summary: Extended HTTP support @@ -49,6 +51,8 @@ Source1: %{proj_name}.ini Patch0: 0001-fix-incompatible-pointer-type.patch Patch1: 0001-return-string-in-output-handler.patch +Patch2: 0001-fix-SplObjectStorage-at-de-tach-deprecation-warnings.patch +Patch3: 0002-fix-150.patch BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -78,12 +82,17 @@ Obsoletes: %{?scl_prefix}php-pecl-http1 < 2 # to allow migration from PHP 7 (last is 2.1.0) Obsoletes: %{?scl_prefix}php-pecl-propro < 2.2 -Provides: %{?scl_prefix}php-pecl(%{proj_name}) = %{version} -Provides: %{?scl_prefix}php-pecl(%{proj_name})%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} +# Extension +Provides: %{?scl_prefix}php-%{pecl_name} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} +# PECL +Provides: %{?scl_prefix}php-pecl(%{proj_name}) = %{version} +Provides: %{?scl_prefix}php-pecl(%{proj_name})%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +# PIE +Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version} +Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version} %description @@ -121,6 +130,8 @@ sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml cd %{sources} %patch -P0 -p1 %patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 extver=$(sed -n '/#define PHP_PECL_HTTP_VERSION/{s/.* "//;s/".*$//;p}' php_http.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then @@ -213,8 +224,6 @@ rm tests/client021.phpt rm tests/client022.phpt rm tests/client025.phpt rm tests/client027.phpt -# broken with 8.5.0alpha3 -rm tests/querystring001_a.phpt export REPORT_EXIT_STATUS=1 @@ -280,6 +289,9 @@ TEST_PHP_ARGS="-n $modules -d extension=$PWD/../NTS/modules/%{pecl_name}.so" \ %changelog +* Mon Sep 1 2025 Remi Collet <remi@fedoraproject.org> - 4.2.6-7 +- add upstream patches for 8.5.0beta2 + * Wed Jul 30 2025 Remi Collet <remi@fedoraproject.org> - 4.2.6-6 - ignore 1 test with PHP 8.5.0apha3 reported as https://github.com/m6w6/ext-http/issues/150 |