From 79e3667e4b3c355058fb21bb142fc7a1ce69adb5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 Dec 2018 10:19:53 +0100 Subject: cleanup for EL-8 --- php-pecl-gnupg.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/php-pecl-gnupg.spec b/php-pecl-gnupg.spec index f5826fa..eb1e31a 100644 --- a/php-pecl-gnupg.spec +++ b/php-pecl-gnupg.spec @@ -24,7 +24,7 @@ Summary: Wrapper around the gpgme library Name: %{?sub_prefix}php-pecl-gnupg Version: 1.4.0 -Release: 6%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 7%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: BSD URL: http://pecl.php.net/package/gnupg @@ -34,12 +34,20 @@ BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear BuildRequires: gpgme-devel +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 6 +BuildRequires: gnupg1 +%else BuildRequires: gnupg < 2 +%endif Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} # We force use of /usr/bin/gpg as gpg2 is unusable in non-interactive mode +%if 0%{?fedora} >= 30 || 0%{?rhel} >= 6 +Requires: gnupg1 +%else Requires: gnupg < 2 +%endif %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} Provides: %{?scl_prefix}php-%{pecl_name} = %{version} @@ -199,7 +207,7 @@ fi %check -%if 0%{?fedora} >= 23 +%if 0%{?fedora} >= 23 || 0%{?rhel} >= 8 sed -e '/GnuPG v1/d' \ %else sed -e 's:GnuPG v1.%d.%d (GNU/Linux):GnuPG v%s:' \ @@ -264,6 +272,9 @@ NO_INTERACTION=1 \ %changelog +* Wed Dec 12 2018 Remi Collet - 1.4.0-7 +- cleanup for EL-8 + * Thu Aug 16 2018 Remi Collet - 1.4.0-6 - rebuild for 7.3.0beta2 new ABI -- cgit