summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ZendFramework-icu54.patch24
-rw-r--r--php-ZendFramework2.spec15
2 files changed, 36 insertions, 3 deletions
diff --git a/ZendFramework-icu54.patch b/ZendFramework-icu54.patch
new file mode 100644
index 0000000..d52eaec
--- /dev/null
+++ b/ZendFramework-icu54.patch
@@ -0,0 +1,24 @@
+From 04333cd50b2a2c3f230d543472734f0b96ca5685 Mon Sep 17 00:00:00 2001
+From: Mark Garrett <mark@moderndeveloperllc.com>
+Date: Tue, 17 Feb 2015 09:58:07 -0600
+Subject: [PATCH] Fix for #7219 - Validation failure fr-CH in
+ testValidationFailures due to change in CLDR 26. Just removed that one
+ instance that is actually valid now.
+
+---
+ tests/ZendTest/I18n/Validator/FloatTest.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/ZendTest/I18n/Validator/FloatTest.php b/tests/ZendTest/I18n/Validator/FloatTest.php
+index 0073c30..ec27528 100644
+--- a/tests/ZendTest/I18n/Validator/FloatTest.php
++++ b/tests/ZendTest/I18n/Validator/FloatTest.php
+@@ -166,7 +166,7 @@ public function validationFailureProvider()
+ 'ar' => array('10.1', '66notflot.6'),
+ 'ru' => array('10.1', '66notflot.6', '2,000.00', '2 00'),
+ 'en' => array('10,1', '66notflot.6', '2.000,00', '2 000', '2,00'),
+- 'fr-CH' => array('10,1', '66notflot.6', '2,000.00', '2 000', "2'00")
++ 'fr-CH' => array('10,1', '66notflot.6', '2,000.00', "2'00")
+ );
+
+ //Loop locales and examples for a more thorough set of "true" test data
diff --git a/php-ZendFramework2.spec b/php-ZendFramework2.spec
index ed35f08..1aec1b5 100644
--- a/php-ZendFramework2.spec
+++ b/php-ZendFramework2.spec
@@ -16,7 +16,7 @@
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
Name: php-ZendFramework2
-Version: 2.3.4
+Version: 2.3.5
Release: 1%{?dist}
Summary: Zend Framework 2
@@ -26,10 +26,13 @@ URL: http://framework.zend.com
Source0: https://packages.zendframework.com/releases/ZendFramework-%{version}/ZendFramework-%{version}.tgz
# git clone https://github.com/zendframework/zf2.git ; cf zf2
# OR cd /work/GIT/zf2; git pull
-# git checkout release-2.3.4
-# tar czf ../ZendFramework-tests-2.3.4.tgz tests
+# git checkout release-2.3.5
+# tar czf ../ZendFramework-tests-2.3.5.tgz tests
Source1: ZendFramework-tests-%{version}.tgz
+# See https://github.com/zendframework/zf2/issues/7219
+Patch0: ZendFramework-icu54.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
%if %{with_tests}
@@ -1847,6 +1850,8 @@ If the XML document uses ENTITY the library throw an Exception.
%prep
%setup -q -n ZendFramework-%{version} -a 1
+%patch0 -p1
+
%build
# Empty build section, nothing required
@@ -2544,6 +2549,10 @@ exit $RET
# ##############################################################################
%changelog
+* Tue Feb 24 2015 Remi Collet <remi@fedoraproject.org> - 2.3.5-1
+- Update to 2.3.5
+- add patch for icu 54, FTBFS detected by Koschei
+
* Fri Jan 16 2015 Remi Collet <remi@fedoraproject.org> - 2.3.4-1
- Update to 2.3.4
- drop GLPI patch, fixed upstream