summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-horde-Horde-Crypt.spec22
1 files changed, 18 insertions, 4 deletions
diff --git a/php-horde-Horde-Crypt.spec b/php-horde-Horde-Crypt.spec
index 39b9f02..037e3da 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.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Horde Cryptography API
Group: Development/Libraries
@@ -21,6 +21,9 @@ 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
@@ -33,7 +36,9 @@ 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
BuildRequires: %{_bindir}/gpg
-#BuildRequires: %{_bindir}/gpg2
+%if 0%{?fedora}
+BuildRequires: %{_bindir}/gpg2
+%endif
Requires(post): %{__pear}
Requires(postun): %{__pear}
@@ -73,11 +78,13 @@ 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
@@ -115,13 +122,17 @@ cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
: Skip online test
rm PgpKeyserverTest.php
+%if 0%{?fedora}
# use both versions
-#sed -e "/gnupg2/s:false:'/usr/bin/gpg2':" conf.php.dist >conf.php
+export CRYPTPGP_TEST_CONFIG='{"gnupg":"%{_bindir}/gpg","gnupg2":"%{_bindir}/gpg2"}'
+%{_bindir}/gpg2 --version
+%endif
+%{_bindir}/gpg --version
ret=0
for cmd in php php56 php70 php71 php72; do
if which $cmd; then
- $cmd %{_bindir}/phpunit --verbose . || ret=1
+ $cmd %{_bindir}/phpunit --verbose .
fi
done
exit $ret
@@ -149,6 +160,9 @@ fi
%changelog
+* Tue May 23 2017 Remi Collet <remi@remirepo.net> - 2.7.8-2
+- test build (using both gnupg versions)
+
* Wed May 3 2017 Remi Collet <remi@remirepo.net> - 2.7.8-1
- Update to 2.7.8
- drop patch merged upstream