summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-horde-Horde-Crypt.spec18
1 files changed, 8 insertions, 10 deletions
diff --git a/php-horde-Horde-Crypt.spec b/php-horde-Horde-Crypt.spec
index 037e3da..94f45a0 100644
--- a/php-horde-Horde-Crypt.spec
+++ b/php-horde-Horde-Crypt.spec
@@ -12,8 +12,8 @@
%global pear_channel pear.horde.org
Name: php-horde-Horde-Crypt
-Version: 2.7.8
-Release: 2%{?dist}
+Version: 2.7.9
+Release: 1%{?dist}
Summary: Horde Cryptography API
Group: Development/Libraries
@@ -21,9 +21,6 @@ License: LGPLv2
URL: http://%{pear_channel}
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
-# https://github.com/horde/horde/pull/221
-Patch0: 221.patch
-
BuildArch: noarch
BuildRequires: php(language) >= 5.3.0
BuildRequires: php-pear(PEAR) >= 1.7.0
@@ -78,13 +75,11 @@ systems.
%prep
%setup -q -c
cd %{pear_name}-%{version}
-%patch0 -p3
# Don't install .po and .pot files
# Remove checksum for .mo, as we regenerate them
sed -e '/%{pear_name}.po/d' \
-e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
- -e '/Binary.php/s/md5sum=.*name=/name=/' \
../package.xml >%{name}.xml
touch -r ../package.xml %{name}.xml
@@ -122,9 +117,9 @@ cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
: Skip online test
rm PgpKeyserverTest.php
-%if 0%{?fedora}
-# use both versions
-export CRYPTPGP_TEST_CONFIG='{"gnupg":"%{_bindir}/gpg","gnupg2":"%{_bindir}/gpg2"}'
+%if 0%{?fedora} >= 26
+# 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
%{_bindir}/gpg --version
@@ -160,6 +155,9 @@ fi
%changelog
+* Fri Jun 23 2017 Remi Collet <remi@remirepo.net> - 2.7.9-1
+- Update to 2.7.9
+
* Tue May 23 2017 Remi Collet <remi@remirepo.net> - 2.7.8-2
- test build (using both gnupg versions)