From ca01192ba6ff625f32a95ffe885b0e38b4b58ee1 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 19 Apr 2016 07:44:47 +0200
Subject: php-zendframework-zend-view: 2.6.7

---
 composer.json                    | 74 ++++++++++++++++++++++++++++++++++++++++
 php-zendframework-zend-view.spec | 14 ++++++--
 2 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 composer.json

diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..7a6ed17
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,74 @@
+{
+    "name": "zendframework/zend-view",
+    "description": "provides a system of helpers, output filters, and variable escaping",
+    "license": "BSD-3-Clause",
+    "keywords": [
+        "zf2",
+        "view"
+    ],
+    "homepage": "https://github.com/zendframework/zend-view",
+    "autoload": {
+        "psr-4": {
+            "Zend\\View\\": "src/"
+        }
+    },
+    "require": {
+        "php": "^5.5 || ^7.0",
+        "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+        "zendframework/zend-loader": "^2.5",
+        "zendframework/zend-stdlib": "^2.7 || ^3.0"
+    },
+    "require-dev": {
+        "zendframework/zend-authentication": "^2.5",
+        "zendframework/zend-cache": "^2.6.1",
+        "zendframework/zend-config": "^2.6",
+        "zendframework/zend-console": "^2.6",
+        "zendframework/zend-escaper": "^2.5",
+        "zendframework/zend-feed": "^2.7",
+        "zendframework/zend-filter": "^2.6.1",
+        "zendframework/zend-http": "^2.5.4",
+        "zendframework/zend-i18n": "^2.6",
+        "zendframework/zend-json": "^2.6.1",
+        "zendframework/zend-log": "^2.7",
+        "zendframework/zend-modulemanager": "^2.7.1",
+        "zendframework/zend-mvc": "^2.7",
+        "zendframework/zend-navigation": "^2.5",
+        "zendframework/zend-paginator": "^2.5",
+        "zendframework/zend-permissions-acl": "^2.6",
+        "zendframework/zend-router": "^3.0.1",
+        "zendframework/zend-serializer": "^2.6.1",
+        "zendframework/zend-session": "^2.6.2",
+        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+        "zendframework/zend-uri": "^2.5",
+        "fabpot/php-cs-fixer": "1.7.*",
+        "phpunit/phpunit": "^4.5"
+    },
+    "suggest": {
+        "zendframework/zend-authentication": "Zend\\Authentication component",
+        "zendframework/zend-escaper": "Zend\\Escaper component",
+        "zendframework/zend-feed": "Zend\\Feed component",
+        "zendframework/zend-filter": "Zend\\Filter component",
+        "zendframework/zend-http": "Zend\\Http component",
+        "zendframework/zend-i18n": "Zend\\I18n component",
+        "zendframework/zend-json": "Zend\\Json component",
+        "zendframework/zend-mvc": "Zend\\Mvc component",
+        "zendframework/zend-navigation": "Zend\\Navigation component",
+        "zendframework/zend-paginator": "Zend\\Paginator component",
+        "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
+        "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+        "zendframework/zend-uri": "Zend\\Uri component"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.6-dev",
+            "dev-develop": "2.7-dev"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "ZendTest\\View\\": "test/"
+        }
+    }
+}
diff --git a/php-zendframework-zend-view.spec b/php-zendframework-zend-view.spec
index 62f947e..e256a18 100644
--- a/php-zendframework-zend-view.spec
+++ b/php-zendframework-zend-view.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    b6cbad62a95ba9bf1ce8814bbd4a1d2316041cb9
+%global gh_commit    9993386447a618a39e6e8105026f5874720c7d3f
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-view
@@ -20,7 +20,7 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.6.5
+Version:        2.6.7
 Release:        1%{?dist}
 Summary:        Zend Framework %{library} component
 
@@ -60,6 +60,7 @@ BuildRequires:  php-composer(%{gh_owner}/zend-stdlib)           >= 2.5
 #        "zendframework/zend-navigation": "^2.5",
 #        "zendframework/zend-paginator": "^2.5",
 #        "zendframework/zend-permissions-acl": "^2.6",
+#        "zendframework/zend-router": "^3.0.1",
 #        "zendframework/zend-serializer": "^2.6.1",
 #        "zendframework/zend-session": "^2.6.2",
 #        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
@@ -82,6 +83,7 @@ BuildRequires:  php-composer(%{gh_owner}/zend-mvc)              >= 2.7
 BuildRequires:  php-composer(%{gh_owner}/zend-navigation)       >= 2.5
 BuildRequires:  php-composer(%{gh_owner}/zend-paginator)        >= 2.5
 BuildRequires:  php-composer(%{gh_owner}/zend-permissions-acl)  >= 2.6
+#BuildRequires:  php-composer(%{gh_owner}/zend-router)           >= 3.0.1
 BuildRequires:  php-composer(%{gh_owner}/zend-serializer)       >= 2.6.1
 BuildRequires:  php-composer(%{gh_owner}/zend-session)          >= 2.6.2
 BuildRequires:  php-composer(%{gh_owner}/zend-servicemanager)   >= 2.7.5
@@ -169,6 +171,9 @@ cp -pr src %{buildroot}%{php_home}/Zend/%{library}
 
 %check
 %if %{with_tests}
+# Ignore test which requires router v3
+rm test/Helper/UrlTest.php
+
 mkdir vendor
 cat << 'EOF' | tee vendor/autoload.php
 <?php
@@ -182,7 +187,7 @@ Zend\Loader\AutoloaderFactory::factory(array(
 require_once '%{php_home}/Zend/autoload.php';
 EOF
 
-%{_bindir}/phpunit --include-path=%{buildroot}%{php_home}
+%{_bindir}/phpunit -d memory_limit=256M --include-path=%{buildroot}%{php_home}
 
 if which php70; then
    php70 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home}
@@ -206,6 +211,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 19 2016 Remi Collet <remi@fedoraproject.org> - 2.6.7-1
+- version 2.6.7
+
 * Mon Mar 21 2016 Remi Collet <remi@fedoraproject.org> - 2.6.5-1
 - version 2.6.5
 
-- 
cgit