diff options
Diffstat (limited to 'php-pecl-http.spec')
| -rw-r--r-- | php-pecl-http.spec | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/php-pecl-http.spec b/php-pecl-http.spec index dbdfb7c..7535e60 100644 --- a/php-pecl-http.spec +++ b/php-pecl-http.spec @@ -50,7 +50,7 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 0.5.%{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: http://pecl.php.net/get/%{proj_name}-%{upstream_version}%{?upstream_prever}.tgz %endif Summary: Extended HTTP support @@ -62,6 +62,7 @@ URL: http://pecl.php.net/package/pecl_http Source1: %{proj_name}.ini Patch0: https://patch-diff.githubusercontent.com/raw/m6w6/ext-http/pull/85.patch +Patch1: %{proj_name}-upstream.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7 @@ -104,16 +105,6 @@ Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -Obsoletes: php53-pecl-http <= %{version} -Obsoletes: php53u-pecl-http <= %{version} -Obsoletes: php54-pecl-http <= %{version} -Obsoletes: php54w-pecl-http <= %{version} -Obsoletes: php55u-pecl-http <= %{version} -Obsoletes: php55w-pecl-http <= %{version} -Obsoletes: php56u-pecl-http <= %{version} -Obsoletes: php56w-pecl-http <= %{version} -Obsoletes: php70u-pecl-http <= %{version} -Obsoletes: php70w-pecl-http <= %{version} %if "%{php_version}" > "7.1" Obsoletes: php71u-pecl-http <= %{version} Obsoletes: php71w-pecl-http <= %{version} @@ -123,9 +114,13 @@ Obsoletes: php72u-pecl-http <= %{version} Obsoletes: php72w-pecl-http <= %{version} %endif %if "%{php_version}" > "7.3" -Obsoletes: php73u-pecl-http <= %{version} +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 %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -178,7 +173,13 @@ 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}" > "7.4" +%patch1 -p1 -b .up +rm tests/etag001.phpt +rm tests/message015.phpt +%else %patch0 -p1 -b .pr85 +%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 @@ -267,7 +268,7 @@ export REPORT_EXIT_STATUS=1 user=$(id -un) : all tests when rpmbuild is used if [ "$user" = "remi" ]; then -export SKIP_ONLINE_TESTS=0 +export SKIP_ONLINE_TESTS=1 else : only local tests when mock is used export SKIP_ONLINE_TESTS=1 @@ -368,6 +369,9 @@ fi %changelog +* Thu Jun 6 2019 Remi Collet <remi@remirepo.net> - 3.2.0-5 +- add upstream patch for 7.4 + * Thu Mar 7 2019 Remi Collet <remi@remirepo.net> - 3.2.0-4 - rebuild with libicu62 |