From 9923083e1c78c36b136c4569aa81f4d3b4a9b69a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 2 Mar 2021 07:14:18 +0100
Subject: update to 1.3 drop patch merged upstream

---
 php-pecl-ssh2.spec | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

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

diff --git a/php-pecl-ssh2.spec b/php-pecl-ssh2.spec
index 7b7a486..8d0a760 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-2020 Remi Collet
+# Copyright (c) 2011-2021 Remi Collet
 #
 # Fedora spec file for php-pecl-ssh2
 #
@@ -27,23 +27,22 @@
 
 Name:           %{?sub_prefix}php-pecl-ssh2
 Summary:        Bindings for the libssh2 library
-Version:        1.2
+Version:        1.3
 %if 0%{?gh_date}
 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}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz
 %else
-Release:        4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 %endif
 
-Patch0:         https://patch-diff.githubusercontent.com/raw/php/pecl-networking-ssh2/pull/44.patch
-
 License:        PHP
 URL:            https://pecl.php.net/package/%{pecl_name}
 
+BuildRequires:  make
 BuildRequires:  libssh2-devel >= 1.2
 BuildRequires:  %{?dtsprefix}gcc
-BuildRequires:  %{?scl_prefix}php-devel > 7
+BuildRequires:  %{?scl_prefix}php-devel >= 7.0
 BuildRequires:  %{?scl_prefix}php-pear
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
@@ -80,12 +79,6 @@ Obsoletes:      php80-pecl-%{pecl_name} <= %{version}
 %endif
 %endif
 
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter private shared
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
-
 
 %description
 Bindings to the libssh2 library which provide access to resources
@@ -118,8 +111,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch0 -p1 -b .pr43
-
 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}.
@@ -232,6 +223,10 @@ fi
 
 
 %changelog
+* Tue Mar  2 2021 Remi Collet <remi@remirepo.net> - 1.3-1
+- update to 1.3
+- drop patch merged upstream
+
 * Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 1.2-4
 - rebuild for PHP 8.0.0RC1
 
-- 
cgit