From 3ee7c98db4fcdc01003f11e9f568af5a48d98b8c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 19 Jul 2018 14:05:53 +0200
Subject: v3.2.0

---
 php-pecl-http.spec | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'php-pecl-http.spec')

diff --git a/php-pecl-http.spec b/php-pecl-http.spec
index 3791f06..47a3b86 100644
--- a/php-pecl-http.spec
+++ b/php-pecl-http.spec
@@ -42,7 +42,7 @@
 %endif
 
 %global upstream_version 3.2.0
-%global upstream_prever  RC1
+#global upstream_prever  RC1
 
 Name:           %{?sub_prefix}php-pecl-http
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
@@ -50,7 +50,7 @@ Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 Release:        0.4.%{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:        3%{?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:        http://pecl.php.net/get/%{proj_name}-%{upstream_version}%{?upstream_prever}.tgz
 %endif
 Summary:        Extended HTTP support
@@ -61,10 +61,6 @@ URL:            http://pecl.php.net/package/pecl_http
 # From http://www.php.net/manual/en/http.configuration.php
 Source1:        %{proj_name}.ini
 
-Patch0:         https://github.com/m6w6/ext-http/commit/512f733beac73f37ba4acbcf730ebc6c6de849b6.patch
-Patch1:         https://github.com/m6w6/ext-http/commit/377d576a6e68def5708cf1ffcd3c233c4dddf356.patch
-Patch2:         https://github.com/m6w6/ext-http/commit/a81472d0108d16e680980a9e0c1b4af0d629c43a.patch
-
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 7
 BuildRequires:  %{?scl_prefix}php-hash
@@ -180,10 +176,6 @@ mv %{proj_name}-%{upstream_version}%{?upstream_prever} NTS
 %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml}
 
 cd NTS
-%patch0 -p1 -b .up0
-%patch1 -p1 -b .up1
-%patch2 -p1 -b .up2
-
 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}.
@@ -276,11 +268,6 @@ else
 export SKIP_ONLINE_TESTS=1
 fi
 
-if pkg-config --atleast-version=7.55 libcurl; then
-# https://github.com/m6w6/ext-http/issues/72
-rm ?TS/tests/client027.phpt
-fi
-
 # Shared needed extensions
 modules=""
 for mod in hash  propro raphf; do
@@ -297,9 +284,6 @@ done
 
 %if %{with_tests}
 rm ?TS/tests/client022.phpt
-if pkg-config --atleast-version=7.49 libcurl; then
-  rm ?TS/tests/client019.phpt
-fi
 
 : Upstream test suite NTS extension
 cd NTS
@@ -370,6 +354,9 @@ fi
 
 
 %changelog
+* Thu Jul 19 2018 Remi Collet <remi@remirepo.net> - 3.2.0-1
+- update to 3.2.0 (php 7, stable)
+
 * Wed Jul 18 2018 Remi Collet <remi@remirepo.net> - 3.2.0~RC1-3
 - rebuld for 7.3.0alpha4 new ABI
 
-- 
cgit