[php-ZendFramework2] Drop php-gmp dependency from Math component (BZ #1152440)
Shawn Iwinski
siwinski at fedoraproject.org
Sun Oct 19 05:07:44 UTC 2014
commit 6f7cd104b1f8f738ccd660193741c10059e99333
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date: Sun Oct 19 01:07:19 2014 -0400
Drop php-gmp dependency from Math component (BZ #1152440)
- Fix tests' autoloader
php-ZendFramework2.spec | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/php-ZendFramework2.spec b/php-ZendFramework2.spec
index 06349fe..08b6077 100644
--- a/php-ZendFramework2.spec
+++ b/php-ZendFramework2.spec
@@ -1,3 +1,15 @@
+#
+# RPM spec file for php-ZendFramework2
+#
+# Copyright (c) 2013-2014 Shawn Iwinski <shawn.iwinski at gmail.com>
+# Remi Collet <remi at fedoraproject.org>
+#
+# License: MIT
+# http://opensource.org/licenses/MIT
+#
+# Please preserve changelog entries
+#
+
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
%global composer_vendor zendframework
#global with_tests %{?_with_tests:1}%{!?_with_tests:0}
@@ -5,7 +17,7 @@
Name: php-ZendFramework2
Version: 2.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Zend Framework 2
Group: Development/Libraries
@@ -13,8 +25,8 @@ License: BSD
URL: http://framework.zend.com
Source0: https://packages.zendframework.com/releases/ZendFramework-%{version}/ZendFramework-%{version}.tgz
# git clone https://github.com/zendframework/zf2.git
-# cd zf2 ; git checkout release-2.3.2
-# tar czf ../ZendFramework-tests-2.3.2.tgz tests
+# cd zf2 ; git checkout release-2.3.3
+# tar czf ../ZendFramework-tests-2.3.3.tgz tests
Source1: ZendFramework-tests-%{version}.tgz
# Patch needed for GLPI
@@ -29,7 +41,7 @@ BuildArch: noarch
%if %{with_tests}
# PHPUnit + autoloader
BuildRequires: %{_bindir}/phpunit
-BuildRequires: php-composer(symfony/class-loader) >= 2.0
+BuildRequires: php-symfony-classloader >= 2.0
# required by components
BuildRequires: php(language) >= 5.3.23
BuildRequires: php-bcmath
@@ -1021,7 +1033,8 @@ Requires: %{name}-common = %{version}-%{release}
# ircmaxell/random-lib
Requires: php-composer(%{composer_vendor}/zend-servicemanager) = %{version}
Requires: php-bcmath
-Requires: php-gmp
+# php-gmp causes issues (see BZ #1152440)
+#Requires: php-gmp
# phpcompatinfo (computed from version 2.3.1)
Requires: php-mcrypt
Requires: php-openssl
@@ -1037,6 +1050,8 @@ supported functionalities are:
* Zend\Math\Rand: A random number generator
* Zend\Math\BigInteger: A library to manage big integers
+Optional: php-gmp
+
# ------------------------------------------------------------------------------
%package Memory
@@ -1779,6 +1794,9 @@ If the XML document uses ENTITY the library throw an Exception.
%patch0 -p0
+# php-ZendFramework2-I18n.noarch: E: backup-file-in-package /usr/share/php/Zend/I18n/Translator/Loader/Gettext.php.orig
+rm -f library/Zend/I18n/Translator/Loader/Gettext.php.orig
+
%build
# Empty build section, nothing required
@@ -1803,9 +1821,7 @@ cd tests
# Create autoloader
cat > _autoload.php <<'AUTOLOADER'
<?php
-if (!class_exists('Symfony\\Component\\ClassLoader\\UniversalClassLoader', false)) {
- require_once __DIR__.'/../src/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-}
+require_once 'Symfony/Component/ClassLoader/UniversalClassLoader.php';
use Symfony\Component\ClassLoader\UniversalClassLoader;
$loader = new UniversalClassLoader();
@@ -2430,6 +2446,10 @@ exit $RET
# ##############################################################################
%changelog
+* Fri Oct 17 2014 Shawn Iwinski <shawn.iwinski at gmail.com> - 2.3.3-2
+- Drop php-gmp dependency from Math component (BZ #1152440)
+- Fix tests' autoloader
+
* Fri Oct 10 2014 Remi Collet <remi at fedoraproject.org> - 2.3.3-1
- Update to 2.3.3
- fix SQL injection with SqlSrv ZF2014-05 CVE-2014-8088 #1151276
More information about the scm-commits
mailing list