From 88e2423e2670f63720714b07ad80094dd6b2211c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 28 Jun 2018 09:51:09 +0200
Subject: add upstream patches for 7.3

---
 php-pecl-ssh2.spec | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

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

diff --git a/php-pecl-ssh2.spec b/php-pecl-ssh2.spec
index 3096a0a..c520958 100644
--- a/php-pecl-ssh2.spec
+++ b/php-pecl-ssh2.spec
@@ -1,7 +1,7 @@
 # remirepo spec file for php-pecl-ssh2
 # with SCL compatibility
 #
-# Copyright (c) 2011-2017 Remi Collet
+# Copyright (c) 2011-2018 Remi Collet
 #
 # Fedora spec file for php-pecl-ssh2
 #
@@ -30,7 +30,7 @@ Version:        1.1.2
 Release:        0.3.%{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}/%{gh_project}-%{version}%{?prever}-%{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}.tgz
 %endif
 Summary:        Bindings for the libssh2 library
@@ -38,10 +38,13 @@ Summary:        Bindings for the libssh2 library
 %global buildver %(pkg-config --silence-errors --modversion libssh2  2>/dev/null || echo 65536)
 
 License:        PHP
-Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
 
+Patch0:         https://github.com/php/pecl-networking-ssh2/commit/a8835aab2c15e794fce13bd927295719e384ad2d.patch
+Patch1:         https://github.com/php/pecl-networking-ssh2/commit/073067ba96ac99ed5696d27f13ca6c8124986e74.patch
+
 BuildRequires:  libssh2-devel >= 1.2
+BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel > 7
 BuildRequires:  %{?scl_prefix}php-pear
 
@@ -119,6 +122,9 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
+%patch0 -p1 -b .up0
+%patch1 -p1 -b .up1
+
 extver=$(sed -n '/#define PHP_SSH2_VERSION/{s/.*\t"//;s/".*$//;p}' php_ssh2.h)
 if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then
    : Error: Upstream version is now ${extver}, expecting %{version}%{?gh_date:-dev}.
@@ -193,7 +199,7 @@ done
 %endif
 
 
-%if 0%{?fedora} < 24
+%if 0%{?fedora} < 24 && 0%{?rhel} < 8
 # when pear installed alone, after us
 %triggerin -- %{?scl_prefix}php-pear
 if [ -x %{__pecl} ] ; then
@@ -231,6 +237,9 @@ fi
 
 
 %changelog
+* Thu Jun 28 2018 Remi Collet <remi@remirepo.net> - 1.1.2-2
+- add upstream patches for 7.3
+
 * Tue Aug  1 2017 Remi Collet <remi@remirepo.net> - 1.1.2-1
 - Update to 1.1.2 (alpha, no change)
 
-- 
cgit