From 465bce1910106c9b9eef93276b938caf6f1e8f4a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Jun 2021 10:14:21 +0200 Subject: add patches for 8.1 from upstream and from https://github.com/m6w6/ext-pq/pull/40 --- php-pecl-pq.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'php-pecl-pq.spec') diff --git a/php-pecl-pq.spec b/php-pecl-pq.spec index 06c32bd..ce9c285 100644 --- a/php-pecl-pq.spec +++ b/php-pecl-pq.spec @@ -32,12 +32,15 @@ Version: 2.1.8 Release: 0.11.%{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: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz %endif License: BSD URL: https://pecl.php.net/package/%{pecl_name} +# Upstream patches +Patch0: %{pecl_name}-php81.patch + %if 0%{?fedora} >= 29 && 0%{?rhel} >= 8 BuildRequires: libpq-devel > 9 %else @@ -115,6 +118,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 @@ -282,6 +287,10 @@ exit $RET %changelog +* Fri Jun 11 2021 Remi Collet - 2.1.8-5 +- add patches for 8.1 from upstream and from + https://github.com/m6w6/ext-pq/pull/40 + * Fri Apr 30 2021 Remi Collet - 2.1.8-4 - F34 rebuild for https://github.com/remicollet/remirepo/issues/174 -- cgit