[php-ZendFramework2] - Update to 2.3.4 - drop GLPI patch, fixed upstream - add dependency on ircmaxell/random-lib - apply

Remi Collet remi at fedoraproject.org
Fri Jan 16 07:36:28 UTC 2015 

commit c60ea5552c1e0b7f1f9d41fd81f8e79b0bb5860e
Author: Remi Collet <remi at fedoraproject.org>
Date:   Fri Jan 16 08:36:47 2015 +0100

    - Update to 2.3.4
    - drop GLPI patch, fixed upstream
    - add dependency on ircmaxell/random-lib
    - apply upstream changes to inter-package dependencies

 .gitignore                    |    2 +
 php-ZendFramework2-glpi.patch |   33 -----------------------
 php-ZendFramework2.spec       |   59 ++++++++++++++++++++---------------------
 sources                       |    4 +-
 4 files changed, 33 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 428b256..43c78cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ clog
 /ZendFramework-tests-2.3.2.tgz
 /ZendFramework-2.3.3.tgz
 /ZendFramework-tests-2.3.3.tgz
+/ZendFramework-2.3.4.tgz
+/ZendFramework-tests-2.3.4.tgz
diff --git a/php-ZendFramework2.spec b/php-ZendFramework2.spec
index 08b6077..914dda1 100644
--- a/php-ZendFramework2.spec
+++ b/php-ZendFramework2.spec
@@ -1,7 +1,7 @@
 #
 # RPM spec file for php-ZendFramework2
 #
-# Copyright (c) 2013-2014 Shawn Iwinski <shawn.iwinski at gmail.com>
+# Copyright (c) 2013-2015 Shawn Iwinski <shawn.iwinski at gmail.com>
 #                         Remi Collet <remi at fedoraproject.org>
 #
 # License: MIT
@@ -16,8 +16,8 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 
 Name:      php-ZendFramework2
-Version:   2.3.3
-Release:   2%{?dist}
+Version:   2.3.4
+Release:   1%{?dist}
 Summary:   Zend Framework 2
 
 Group:     Development/Libraries
@@ -25,18 +25,10 @@ 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.3
-# tar czf ../ZendFramework-tests-2.3.3.tgz tests
+# cd zf2 ; git checkout release-2.3.4
+# tar czf ../ZendFramework-tests-2.3.4.tgz tests
 Source1:   ZendFramework-tests-%{version}.tgz
 
-# Patch needed for GLPI
-# https://bugzilla.redhat.com/1014478
-#
-# ZF-11974: Zend_Translate, Plural - unable to get translation of terms when
-# singular = plural (ex: software)
-# http://framework.zend.com/issues/browse/ZF-11974
-Patch0:    %{name}-glpi.patch
-
 BuildArch: noarch
 %if %{with_tests}
 # PHPUnit + autoloader
@@ -77,7 +69,7 @@ BuildRequires: php-xmlreader
 BuildRequires: php-xmlwriter
 BuildRequires: php-zip
 BuildRequires: php-zlib
-#BuildRequires: php-composer(ircmaxell/random-lib)
+BuildRequires: php-composer(ircmaxell/random-lib)
 BuildRequires: php-composer(mikey179/vfsStream) >= 1.2
 %endif
 
@@ -249,8 +241,8 @@ Requires: %{name}-common         = %{version}-%{release}
 Requires: php-composer(%{composer_vendor}/zend-eventmanager)     = %{version}
 Requires: php-composer(%{composer_vendor}/zend-servicemanager)   = %{version}
 Requires: php-composer(%{composer_vendor}/zend-stdlib)           = %{version}
-# composer.json (optional)
 Requires: php-composer(%{composer_vendor}/zend-serializer)       = %{version}
+# composer.json (optional)
 Requires: php-composer(%{composer_vendor}/zend-session)          = %{version}
 # phpcompatinfo (computed from version 2.3.1)
 Requires: php-date
@@ -381,6 +373,9 @@ URL:      http://framework.zend.com/manual/2.3/en/modules/zend.console.introduct
 Requires: %{name}-common = %{version}-%{release}
 # composer.json
 Requires: php-composer(%{composer_vendor}/zend-stdlib)           = %{version}
+# composer.json (optional)
+Requires: php-composer(%{composer_vendor}/zend-validator)        = %{version}
+Requires: php-composer(%{composer_vendor}/zend-filter)           = %{version}
 # phpcompatinfo (computed from version 2.3.1)
 Requires: php-pcre
 Requires: php-reflection
@@ -460,10 +455,11 @@ Summary:  Zend Framework 2: DB Component
 URL:      http://framework.zend.com/manual/2.3/en/index.html#zend-db
 
 Requires: %{name}-common         = %{version}-%{release}
+# composer.json
+Requires: php-composer(%{composer_vendor}/zend-stdlib)           = %{version}
 # composer.json (optional)
 Requires: php-composer(%{composer_vendor}/zend-eventmanager)     = %{version}
 Requires: php-composer(%{composer_vendor}/zend-servicemanager)   = %{version}
-Requires: php-composer(%{composer_vendor}/zend-stdlib)           = %{version}
 # phpcompatinfo (computed from version 2.3.1)
 Requires: php-date
 Requires: php-pcre
@@ -870,6 +866,7 @@ Requires: php-composer(%{composer_vendor}/zend-stdlib)           = %{version}
 # composer.json (optional)
 Requires: php-composer(%{composer_vendor}/zend-http)             = %{version}
 Requires: php-composer(%{composer_vendor}/zend-server)           = %{version}
+Requires: php-composer(%{composer_vendor}/zendxml)               = %{version}
 # phpcompatinfo (computed from version 2.3.1)
 Requires: php-json
 Requires: php-mbstring
@@ -1032,6 +1029,7 @@ Requires: %{name}-common         = %{version}-%{release}
 # composer.json (optional)
 #     ircmaxell/random-lib
 Requires: php-composer(%{composer_vendor}/zend-servicemanager)   = %{version}
+Requires: php-composer(ircmaxell/random-lib)
 Requires: php-bcmath
 # php-gmp causes issues (see BZ #1152440)
 #Requires: php-gmp
@@ -1111,7 +1109,6 @@ Requires: php-composer(%{composer_vendor}/zend-stdlib)           = %{version}
 Requires: php-composer(%{composer_vendor}/zend-config)           = %{version}
 Requires: php-composer(%{composer_vendor}/zend-console)          = %{version}
 Requires: php-composer(%{composer_vendor}/zend-loader)           = %{version}
-Requires: php-composer(%{composer_vendor}/zend-mvc)              = %{version}
 Requires: php-composer(%{composer_vendor}/zend-servicemanager)   = %{version}
 # phpcompatinfo (computed from version 2.3.1)
 Requires: php-spl
@@ -1253,6 +1250,8 @@ Summary:  Zend Framework 2: Permissions ACL Component
 URL:      http://framework.zend.com/manual/2.3/en/modules/zend.permissions.acl.intro.html
 
 Requires: %{name}-common = %{version}-%{release}
+# composer.json (optional)
+Requires: php-composer(%{composer_vendor}/zend-servicemanager)   = %{version}
 # phpcompatinfo (computed from version 2.3.1)
 Requires: php-spl
 
@@ -1417,11 +1416,11 @@ URL:      http://framework.zend.com/manual/2.3/en/index.html#zend-session
 
 Requires: %{name}-common         = %{version}-%{release}
 # composer.json
+Requires: php-composer(%{composer_vendor}/zend-eventmanager)     = %{version}
 Requires: php-composer(%{composer_vendor}/zend-stdlib)           = %{version}
 # composer.json (optional)
 Requires: php-composer(%{composer_vendor}/zend-cache)            = %{version}
 Requires: php-composer(%{composer_vendor}/zend-db)               = %{version}
-Requires: php-composer(%{composer_vendor}/zend-eventmanager)     = %{version}
 Requires: php-composer(%{composer_vendor}/zend-http)             = %{version}
 Requires: php-composer(%{composer_vendor}/zend-servicemanager)   = %{version}
 Requires: php-composer(%{composer_vendor}/zend-validator)        = %{version}
@@ -1481,6 +1480,7 @@ Requires: %{name}-common         = %{version}-%{release}
 Requires: php-composer(%{composer_vendor}/zend-eventmanager)     = %{version}
 Requires: php-composer(%{composer_vendor}/zend-serializer)       = %{version}
 Requires: php-composer(%{composer_vendor}/zend-servicemanager)   = %{version}
+Requires: php-composer(%{composer_vendor}/zend-filter)           = %{version}
 # phpcompatinfo (computed from version 2.3.1)
 Requires: php-date
 Requires: php-iconv
@@ -1736,6 +1736,8 @@ Requires: php-composer(%{composer_vendor}/zend-math)             = %{version}
 Requires: php-composer(%{composer_vendor}/zend-server)           = %{version}
 Requires: php-composer(%{composer_vendor}/zend-stdlib)           = %{version}
 Requires: php-composer(%{composer_vendor}/zendxml)               = %{version}
+# composer.json (optional)
+Requires: php-composer(%{composer_vendor}/zend-cache)            = %{version}
 # phpcompatinfo (computed from version 2.3.1)
 Requires: php-date
 Requires: php-dom
@@ -1792,11 +1794,6 @@ If the XML document uses ENTITY the library throw an Exception.
 %prep
 %setup -q -n ZendFramework-%{version} -a 1
 
-%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
@@ -1828,8 +1825,8 @@ $loader = new UniversalClassLoader();
 $loader->registerNamespace('Zend',             __DIR__.'/../library');
 $loader->registerNamespace('ZendTest',         __DIR__);
 $loader->registerNamespace('org\\bovigo\\vfs', '/usr/share/php');
-//$loader->registerNamespace('RandomLib',      '/usr/share/php');
-//$loader->registerNamespace('SecurityLib',    '/usr/share/php');
+$loader->registerNamespace('RandomLib',      '/usr/share/php');
+$loader->registerNamespace('SecurityLib',    '/usr/share/php');
 $loader->useIncludePath(true);
 $loader->register();
 AUTOLOADER
@@ -1849,8 +1846,6 @@ rm    ZendTest/Version/VersionTest.php
 rm    ZendTest/Ldap/Converter/ConverterTest.php
 # Need mongodb server
 rm    ZendTest/Session/SaveHandler/MongoDBTest.php
-# Need ircmaxell/random-lib
-rm    ZendTest/Math/RandTest.php
 # Strangly fail, lack of date.timezone
 rm    ZendTest/Session/SessionManagerTest.php
 # Need investigation
@@ -1862,9 +1857,7 @@ rm    ZendTest/Serializer/Adapter/WddxTest.php
 
 RET=0
 for dir in ZendTest/[A-Z]*
-do phpunit \
-     -d date.timezone="UTC" \
-     $dir || RET=1
+do phpunit $dir || RET=1
 done
 exit $RET
 %endif
@@ -2446,6 +2439,12 @@ exit $RET
 # ##############################################################################
 
 %changelog
+* Fri Jan 16 2015 Remi Collet <remi at fedoraproject.org> - 2.3.4-1
+- Update to 2.3.4
+- drop GLPI patch, fixed upstream
+- add dependency on ircmaxell/random-lib
+- apply upstream changes to inter-package dependencies
+
 * 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
diff --git a/sources b/sources
index eae19b6..a7eaa25 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-62d3d0b642018b95b9d8482504982f2e  ZendFramework-2.3.3.tgz
-a72518a844fb1ccc66a16bf4a77f529b  ZendFramework-tests-2.3.3.tgz
+485a6b2fe93c10c1b381700a740134ad  ZendFramework-2.3.4.tgz
+708dfc4db4fb68bb79957ad2a3b6f45c  ZendFramework-tests-2.3.4.tgz

More information about the scm-commits mailing list