add upstream patch to skip a online test, fix FTBFS detected by Koschei

This commit is contained in:
Remi Collet 2016-03-26 11:47:35 +01:00
parent edfc85ebcb
commit 4c79df4ff6
2 changed files with 34 additions and 3 deletions

21
pecl_http-upstream.patch Normal file
View File

@ -0,0 +1,21 @@
From 1f2b82b9a141d67e285803c353e6e618be8c41d1 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sat, 26 Mar 2016 11:39:09 +0100
Subject: [PATCH] skip online test
---
tests/client019.phpt | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/client019.phpt b/tests/client019.phpt
index eea116a..c386a68 100644
--- a/tests/client019.phpt
+++ b/tests/client019.phpt
@@ -3,6 +3,7 @@ client proxy - send proxy headers for a proxy request
--SKIPIF--
<?php
include "skipif.inc";
+skip_online_test();
skip_client_test();
$client = new http\Client("curl");
array_key_exists("proxyheader", $client->getAvailableOptions())

View File

@ -21,7 +21,7 @@
Name: php-pecl-http
Version: 2.5.6
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Extended HTTP support
License: BSD
@ -32,6 +32,9 @@ Source0: http://pecl.php.net/get/%{proj_name}-%{version}%{?prever}.tgz
# From http://www.php.net/manual/en/http.configuration.php
Source1: %{proj_name}.ini
# Upstream patch
Patch0: %{proj_name}-upstream.patch
BuildRequires: php-devel >= 5.3.0
BuildRequires: php-hash
BuildRequires: php-iconv
@ -95,8 +98,11 @@ These are the files needed to compile programs using HTTP extension.
%prep
%setup -c -q
sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
mv %{proj_name}-%{version}%{?prever} NTS
cd NTS
%patch0 -p1
extver=$(sed -n '/#define PHP_PECL_HTTP_VERSION/{s/.* "//;s/".*$//;p}' php_http.h)
if test "x${extver}" != "x%{version}%{?prever}"; then
@ -214,7 +220,7 @@ NO_INTERACTION=1 \
%files
%{?_licensedir:%license NTS/LICENSE}
%license NTS/LICENSE
%doc %{pecl_docdir}/%{proj_name}
%config(noreplace) %{php_inidir}/%{ini_name}
%{php_extdir}/%{pecl_name}.so
@ -235,8 +241,12 @@ NO_INTERACTION=1 \
%changelog
* Sat Mar 26 2016 Remi Collet <remi@fedoraproject.org> - 2.5.6-2
- add upstream patch to skip a online test
fix FTBFS detected by Koschei
* Wed Mar 9 2016 Remi Collet <remi@fedoraproject.org> - 2.5.6-1
+- Update to 2.5.6 (stable)
- Update to 2.5.6 (stable)
* Wed Feb 10 2016 Remi Collet <remi@fedoraproject.org> - 2.5.5-3
- drop scriptlets (replaced by file triggers in php-pear)