diff options
| -rw-r--r-- | php-horde-Horde-Crypt.spec | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/php-horde-Horde-Crypt.spec b/php-horde-Horde-Crypt.spec index 42f57c0..e74f532 100644 --- a/php-horde-Horde-Crypt.spec +++ b/php-horde-Horde-Crypt.spec @@ -13,7 +13,7 @@ Name: php-horde-Horde-Crypt Version: 2.7.12 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Horde Cryptography API Group: Development/Libraries @@ -31,10 +31,14 @@ BuildRequires: php-pear(%{pear_channel}/Horde_Http) >= 2.0.0 BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.1.0 BuildRequires: php-pear(%{pear_channel}/Horde_Stream) >= 1.5.0 BuildRequires: php-pear(%{pear_channel}/Horde_Url) >= 2.0.0 -# rhel >= 6 have gnupg2 which provides this +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +BuildRequires: %{_bindir}/gpg1 +%else +BuildRequires: %{_bindir}/gpg2 +%endif +# rhel have gnupg2 which provides this BuildRequires: %{_bindir}/gpg %if 0%{?fedora} -BuildRequires: %{_bindir}/gpg2 %endif Requires(post): %{__pear} @@ -117,17 +121,25 @@ cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) : Skip online test rm PgpKeyserverTest.php -%if 0 +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 8 +export CRYPT_TEST_CONFIG='{"gnupg":"%{_bindir}/gpg1,"gnupg2":false}' +%{_bindir}/gpg1 --version +%else +%if 0%{?fedora} # use both versions (still broken with 2.1, ok with 2.0 and 2.2) export CRYPT_TEST_CONFIG='{"gnupg":"%{_bindir}/gpg","gnupg2":"%{_bindir}/gpg2"}' %{_bindir}/gpg2 --version %endif +%endif %{_bindir}/gpg --version ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php70 php71 php72; do if which $cmd; then - $cmd %{_bindir}/phpunit --bootstrap bootstrap.php --verbose . || ret=1 + $cmd %{_bindir}/phpunit \ + --filter '^((?!(testGenerateKey)).)*$' \ + --bootstrap bootstrap.php \ + --verbose . || ret=1 fi done exit $ret @@ -155,6 +167,9 @@ fi %changelog +* Fri Jan 4 2019 Remi Collet <remi@remirepo.net> - 2.7.12-3 +- cleanup for EL-8 + * Mon May 14 2018 Remi Collet <remi@remirepo.net> - 2.7.12-1 - update to 2.7.12 |