From 5bbef2469cdff0536c119b84e390ec5cbe8d40ea Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 11 Sep 2016 17:55:51 +0200
Subject: php-pecl-http: F25

---
 php-pecl-http-php7.spec | 4 +---
 php-pecl-http.spec      | 8 +++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/php-pecl-http-php7.spec b/php-pecl-http-php7.spec
index c516e3f..0431769 100644
--- a/php-pecl-http-php7.spec
+++ b/php-pecl-http-php7.spec
@@ -287,9 +287,7 @@ done
     --modules | grep %{pecl_name}
 
 %if %{with_tests}
-%if "%{php_version}" > "7"
-  rm ?TS/tests/client022.phpt
-%endif
+rm ?TS/tests/client022.phpt
 if pkg-config --atleast-version=7.49 libcurl; then
   rm ?TS/tests/client019.phpt
 fi
diff --git a/php-pecl-http.spec b/php-pecl-http.spec
index 3e0402c..3f0b90b 100644
--- a/php-pecl-http.spec
+++ b/php-pecl-http.spec
@@ -42,7 +42,7 @@
 #global prever RC1
 Name:           %{?sub_prefix}php-pecl-http
 Version:        2.6.0
-Release:        0.1.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        0.2.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Summary:        Extended HTTP support
 
 License:        BSD
@@ -273,6 +273,9 @@ else
 : only local tests when mock is used
 export SKIP_ONLINE_TESTS=1
 fi
+if pkg-config --atleast-version=7.49 libcurl; then
+  rm ?TS/tests/client019.phpt
+fi
 
 # Shared needed extensions
 modules=""
@@ -363,6 +366,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 11 2016 Remi Collet <remi@fedoraproject.org> - 2.6.0-0.2.beta2
+- F25 build
+
 * Wed Sep  7 2016 Remi Collet <remi@fedoraproject.org> - 2.6.0-0.1.beta2
 - Update to 2.6.0beta2 (php 5, beta)
 
-- 
cgit