From d1355b12853c4b8ea8ad096d8360aa332a52e234 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 19 Jun 2019 10:10:10 +0200
Subject: test build for https://github.com/m6w6/ext-pq/pull/33

---
 php-pecl-pq.spec | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

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

diff --git a/php-pecl-pq.spec b/php-pecl-pq.spec
index a9bc90a..5cab4f7 100644
--- a/php-pecl-pq.spec
+++ b/php-pecl-pq.spec
@@ -35,12 +35,14 @@ Version:        2.1.5
 Release:        0.8.%{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:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 %endif
 License:        BSD
 URL:            http://pecl.php.net/package/%{pecl_name}
 
+Patch0:         https://patch-diff.githubusercontent.com/raw/m6w6/ext-pq/pull/33.patch
+
 %if 0%{?fedora} >= 29 && 0%{?rhel} >= 8
 BuildRequires:  libpq-devel > 9
 %else
@@ -82,9 +84,13 @@ Obsoletes:     php72u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php72w-pecl-%{pecl_name} <= %{version}
 %endif
 %if "%{php_version}" > "7.3"
-Obsoletes:     php73u-pecl-%{pecl_name} <= %{version}
+Obsoletes:      php73-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php73w-pecl-%{pecl_name} <= %{version}
 %endif
+%if "%{php_version}" > "7.4"
+Obsoletes:      php74-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php74w-pecl-%{pecl_name} <= %{version}
+%endif
 %endif
 
 %if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -123,6 +129,8 @@ sed -e '/role="test"/d' \
     -i package.xml
 
 cd NTS
+%patch0 -p1
+
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_PQ_VERSION/{s/.* "//;s/".*$//;p}' php_pq.h)
 if test "x${extver}" != "x%{version}%{?prever}"; then
@@ -210,11 +218,6 @@ fi
 : ignore tests with erratic results
 rm ?TS/tests/cancel001.phpt
 
-if ! pkg-config libpq --atleast-version=9.3; then
-  : ignore some tests only because of "diag" content
-  rm ?TS/tests/{async003,async004,async005,async006}.phpt
-fi
-
 OPT="-n"
 [ -f %{php_extdir}/json.so ]  && OPT="$OPT -d extension=json.so"
 [ -f %{php_extdir}/raphf.so ] && OPT="$OPT -d extension=raphf.so"
@@ -297,6 +300,9 @@ exit $RET
 
 
 %changelog
+* Wed Jun 19 2019 Remi Collet <remi@remirepo.net> - 2.1.5-2
+- test build for https://github.com/m6w6/ext-pq/pull/33
+
 * Mon Jan 14 2019 Remi Collet <remi@remirepo.net> - 2.1.5-1
 - update to 2.1.5
 
-- 
cgit