From 139955e435780bbabbb04a134012f7078ec2d5fb Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 17 Mar 2021 09:05:57 +0100
Subject: update to 1.6.5 open https://pear.php.net/bugs/27013 test failure
 with GnuPG 2.2.27

---
 .gitignore              |  2 ++
 php-pear-crypt-gpg.spec | 32 ++++++++++++--------------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1ab5c4f..01f0400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+clog
 package-*.xml
 *.tgz
+*.tar.bz2
 *.tar.gz
 *.tar.xz
 *.tar.xz.asc
diff --git a/php-pear-crypt-gpg.spec b/php-pear-crypt-gpg.spec
index d2078f4..b129271 100644
--- a/php-pear-crypt-gpg.spec
+++ b/php-pear-crypt-gpg.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-pear-crypt-gpg
 #
-# Copyright (c) 2015-2020 Remi Collet
+# Copyright (c) 2015-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -9,16 +9,12 @@
 
 %{!?__pear:       %global __pear       %{_bindir}/pear}
 %global pear_name Crypt_GPG
-%if 0%{?rhel}
-# All features require GnuPG v1 (under investigation)
-%global with_tests 0%{?_with_tests:1}
-%else
-%global with_tests 0%{!?_without_tests:1}
-%endif
+
+%bcond_without    tests
 
 Name:           php-pear-crypt-gpg
-Version:        1.6.4
-Release:        2%{?dist}
+Version:        1.6.5
+Release:        1%{?dist}
 Summary:        GNU Privacy Guard (GnuPG)
 
 License:        LGPLv2+
@@ -30,14 +26,10 @@ Patch0:         %{pear_name}-gpg1.patch
 
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR)
-%if %{with_tests}
+%if %{with tests}
 # for tests
 BuildRequires:  phpunit7
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 6
 BuildRequires:  %{_bindir}/gpg1
-%else
-BuildRequires:  %{_bindir}/gpg
-%endif
 BuildRequires:  %{_bindir}/gpg-agent
 BuildRequires:  %{_bindir}/ps
 %endif
@@ -47,11 +39,7 @@ Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Requires:       php-pear(PEAR)
 
-%if 0%{?fedora} >= 30 || 0%{?rhel} >= 6
 Requires:       %{_bindir}/gpg1
-%else
-Requires:       %{_bindir}/gpg
-%endif
 # From package.pear
 Requires:       php(language) >= 5.4.8
 Requires:       php-pear(Console_CommandLine) >= 1.1.10
@@ -118,13 +106,13 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 install -pm 644 Crypt/GPG/autoload.php %{buildroot}/%{pear_phpdir}/Crypt/GPG/autoload.php
 
 
-%if %{with_tests}
+%if %{with tests}
 %check
 cd %{pear_name}-%{version}/tests
 
 : Upstream test suite
 ret=0
-for cmd in php php72 php73 php74; do
+for cmd in php php73 php74 php80; do
   if which $cmd; then
     $cmd %{_bindir}/phpunit7 \
       --include-path=%{buildroot}%{pear_phpdir} \
@@ -158,6 +146,10 @@ fi
 
 
 %changelog
+* Wed Mar 17 2021 Remi Collet <remi@remirepo.net> - 1.6.5-1
+- update to 1.6.5
+- open https://pear.php.net/bugs/27013 test failure with GnuPG 2.2.27
+
 * Mon Mar 23 2020 Remi Collet <remi@remirepo.net> - 1.6.4-2
 - add classmap autoloader
 
-- 
cgit