diff options
| author | Remi Collet <remi@remirepo.net> | 2019-02-05 11:33:26 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-02-05 11:33:26 +0100 |
| commit | bf5a59cca34319cbd4a87434e95230f1462d4e0a (patch) | |
| tree | d1f47c6ad032747e76365757e621115dcb01185e | |
| parent | 30365c442009a4f1e898fd23decf8f4f37db7dff (diff) | |
fix FTBFS, use gpg1 (F30)
| -rw-r--r-- | php-pear-crypt-gpg.spec | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/php-pear-crypt-gpg.spec b/php-pear-crypt-gpg.spec index 0ddf18c..8189b90 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-2017 Remi Collet +# Copyright (c) 2015-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -20,16 +20,14 @@ Name: php-pear-crypt-gpg Version: 1.6.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: GNU Privacy Guard (GnuPG) -Group: Development/Libraries License: LGPLv2+ URL: http://pear.php.net/package/%{pear_name} Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz -# remirepo:3 -# Use /usr/bin/gpg1 if available, only in #remirepo +# Use /usr/bin/gpg1 if available Patch0: %{pear_name}-gpg1.patch BuildArch: noarch @@ -37,7 +35,11 @@ BuildRequires: php-pear(PEAR) %if %{with_tests} # for tests BuildRequires: php-composer(phpunit/phpunit) +%if 0%{?fedora} >= 30 +BuildRequires: %{_bindir}/gpg1 +%else BuildRequires: %{_bindir}/gpg +%endif BuildRequires: %{_bindir}/gpg-agent # remirepo:1 BuildRequires: gnupg < 2 @@ -48,7 +50,11 @@ Requires(post): %{__pear} Requires(postun): %{__pear} Requires: php-pear(PEAR) +%if 0%{?fedora} >= 30 +Requires: %{_bindir}/gpg1 +%else Requires: %{_bindir}/gpg +%endif # remirepo:1 Requires: gnupg < 2 # From package.pear @@ -82,7 +88,6 @@ is intended only to facilitate public-key cryptography. %{?_licensedir:sed -e '/LICENSE/d' -i package.xml} cd %{pear_name}-%{version} -# remirepo:6 if [ -x %{_bindir}/gpg1 ]; then %patch0 -p1 -b .rpm sed -e '/Engine.php/s/md5sum="[^"]*"//' \ @@ -148,6 +153,9 @@ fi %changelog +* Tue Feb 5 2019 Remi Collet <remi@remirepo.net> - 1.6.3-3 +- fix FTBFS, use gpg1 + * Mon Jun 4 2018 Remi Collet <remi@remirepo.net> - 1.6.3-1 - update to 1.6.3 |