update to 4.2.6HEADmaster

1 files changed, 14 insertions, 45 deletions

diff --git a/php-pecl-http.spec b/php-pecl-http.spec
index d3c8927..ba7b312 100644
--- a/php-pecl-http.spec
+++ b/php-pecl-http.spec
@@ -10,50 +10,35 @@
 # Please, preserve the changelog entries
 #
 %if 0%{?scl:1}
-%scl_package       php-pecl-http
+%scl_package        php-pecl-http
 %else
 %global _root_prefix %{_prefix}
 %endif
 
-%bcond_without libbrotli
+%bcond_without      libbrotli
+%bcond_without      tests
 
 %global gh_commit   a84b499418ee7b8992fd9e7e2abc661735a869bd
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    m6w6
 %global gh_project  ext-http
-#global gh_date     20150928
 # The project is pecl_http but the extension is only http
-%global proj_name pecl_http
-%global pecl_name http
-%global with_zts  0%{!?_without_zts:%{?__ztsphp:1}}
+%global proj_name   pecl_http
+%global pecl_name   http
+%global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
 # after 40-raphf
-%global ini_name  50-%{pecl_name}.ini
-%ifarch %{arm}
-# Test suite disabled because of erratic results on slow ARM (timeout)
-%bcond_with       tests
-%else
-%bcond_without    tests
-%endif
+%global ini_name    50-%{pecl_name}.ini
 
-%global upstream_version 4.2.4
+%global upstream_version 4.2.6
 #global upstream_prever  beta1
 #global upstream_lower   beta1
-%if 0%{?gh_date:1}
-%global sources          %{gh_project}-%{gh_commit}
-%else
 %global sources          %{proj_name}-%{upstream_version}%{?upstream_prever}
-%endif
 %global _configure       ../%{sources}/configure
 
 Name:           %{?scl_prefix}php-pecl-http
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-%if 0%{?gh_date:1}
-Release:        0.10.%{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:        6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        1%{?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
 
 License:        BSD-2-Clause
@@ -62,10 +47,6 @@ 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}-build.patch
-Patch1:         %{proj_name}-php84.patch
-Patch2:         %{proj_name}-curl.patch
-
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 8.0
@@ -131,20 +112,13 @@ These are the files needed to compile programs using HTTP extension.
 
 %prep
 %setup -c -q 
-%if 0%{?gh_date}
-mv NTS/package.xml .
-%endif
 
 sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
 
 cd %{sources}
-%patch -P0 -p1
-%patch -P1 -p1
-%patch -P2 -p1
-
 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}.
+if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
+   : Error: Upstream HTTP version is now ${extver}, expecting %{upstream_version}%{?upstream_prever}.
    : Update the pdover macro and rebuild.
    exit 1
 fi
@@ -154,7 +128,6 @@ cp %{SOURCE1} %{ini_name}
 
 mkdir NTS
 %if %{with_zts}
-# Duplicate source tree for NTS / ZTS build
 mkdir ZTS
 %endif
 
@@ -274,13 +247,6 @@ TEST_PHP_ARGS="-n $modules -d extension=$PWD/../NTS/modules/%{pecl_name}.so" \
     $modules \
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
     --modules | grep '^%{pecl_name}$'
-
-%if %{with tests}
-: Upstream test suite ZTS extension
-TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="-n $modules -d extension=$PWD/../ZTS/modules/%{pecl_name}.so" \
-%{__ztsphp} -n run-tests.php -q --show-diff
-%endif
 %endif
 
 
@@ -306,6 +272,9 @@ TEST_PHP_ARGS="-n $modules -d extension=$PWD/../ZTS/modules/%{pecl_name}.so" \
 
 
 %changelog
+* Wed Nov  6 2024 Remi Collet <remi@remirepo.net> - 4.2.6-1
+- update to 4.2.6
+
 * Mon Sep 30 2024 Remi Collet <remi@remirepo.net> - 4.2.4-6
 - add upstream patch for libcurl 8.9