From 46ef267c6e9f8343d6e9ade61209fd553ebac4c4 Mon Sep 17 00:00:00 2001 From: Remi Collet remi@fedoraproject.org Date: Oct 03 2017 15:36:46 +0000 Subject: mcrypt ios optional
---
diff --git a/php-horde-Horde-Crypt-Blowfish.spec b/php-horde-Horde-Crypt-Blowfish.spec index d8708dc..e3f8c73 100644 --- a/php-horde-Horde-Crypt-Blowfish.spec +++ b/php-horde-Horde-Crypt-Blowfish.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-horde-Horde-Crypt-Blowfish # -# Copyright (c) 2013-2016 Remi Collet +# Copyright (c) 2013-2017 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -12,7 +12,7 @@
Name: php-horde-Horde-Crypt-Blowfish Version: 1.1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Blowfish Encryption Library
Group: Development/Libraries @@ -24,7 +24,6 @@ BuildArch: noarch BuildRequires: php(language) >= 5.3.0 BuildRequires: php-pear(PEAR) >= 1.7.0 BuildRequires: php-hash -BuildRequires: php-mcrypt BuildRequires: php-channel(%{pear_channel}) # To run unit tests BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.1.0 @@ -33,7 +32,6 @@ Requires(post): %{__pear} Requires(postun): %{__pear} Requires: php(language) >= 5.3.0 Requires: php-hash -Requires: php-mcrypt Requires: php-openssl Requires: php-channel(%{pear_channel}) Requires: php-pear(PEAR) >= 1.7.0 @@ -41,6 +39,9 @@ Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Exception) < 3.0.0 Requires: php-pear(%{pear_channel}/Horde_Support) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Support) < 3.0.0 +%if 0%{?fedora} >= 21 +Suggests: php-mcrypt +%endif
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version} Provides: php-composer(horde/horde-crypt-blowfish) = %{version} @@ -75,7 +76,14 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
%check cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) -%{_bindir}/phpunit --verbose . + +ret=0 +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit --verbose . || ret=1 + fi +done +exit $ret
%post @@ -96,10 +104,13 @@ fi %dir %{pear_phpdir}/Horde/Crypt %{pear_phpdir}/Horde/Crypt/Blowfish %{pear_phpdir}/Horde/Crypt/Blowfish.php -%{pear_testdir}/%{pear_name} +%doc %{pear_testdir}/%{pear_name}
%changelog +* Tue Oct 3 2017 Remi Collet remi@fedoraproject.org - 1.1.2-4 +- php-mcrypt is optional + * Thu Jul 27 2017 Fedora Release Engineering releng@fedoraproject.org - 1.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
https://src.fedoraproject.org/rpms/php-horde-Horde-Crypt-Blowfish/c/46ef267c...
scm-commits@lists.fedoraproject.org