From 6e343ea959320bbb74c7d20256d2a31918e1166c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 29 Nov 2017 07:18:30 +0100
Subject: v2.8.1

---
 composer.json                       | 48 +++++++++++++++++++++----------------
 php-zendframework-zend-session.spec | 17 ++++++++-----
 2 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/composer.json b/composer.json
index 0f2df87..253ddb2 100644
--- a/composer.json
+++ b/composer.json
@@ -3,24 +3,27 @@
     "description": "manage and preserve session data, a logical complement of cookie data, across multiple page requests by the same client",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "session"
     ],
-    "homepage": "https://github.com/zendframework/zend-session",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Session\\": "src/"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-session/",
+        "issues": "https://github.com/zendframework/zend-session/issues",
+        "source": "https://github.com/zendframework/zend-session",
+        "rss": "https://github.com/zendframework/zend-session/releases.atom",
+        "slack": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
-        "php": "^7.0 || ^5.6",
+        "php": "^5.6 || ^7.0",
         "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
         "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "require-dev": {
         "container-interop/container-interop": "^1.1",
         "mongodb/mongodb": "^1.0.1",
-        "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+        "phpunit/phpunit": "^5.7.15 || ^6.0.8",
         "zendframework/zend-cache": "^2.6.1",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-db": "^2.7",
@@ -36,21 +39,11 @@
         "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
         "zendframework/zend-validator": "Zend\\Validator component"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.8-dev",
-            "dev-develop": "2.9-dev"
-        },
-        "zf": {
-            "component": "Zend\\Session",
-            "config-provider": "Zend\\Session\\ConfigProvider"
+    "autoload": {
+        "psr-4": {
+            "Zend\\Session\\": "src/"
         }
     },
-    "config": {
-        "sort-packages": true
-    },
     "autoload-dev": {
         "files": [
             "test/autoload.php"
@@ -59,6 +52,19 @@
             "ZendTest\\Session\\": "test/"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.8-dev",
+            "dev-develop": "2.9-dev"
+        },
+        "zf": {
+            "component": "Zend\\Session",
+            "config-provider": "Zend\\Session\\ConfigProvider"
+        }
+    },
     "scripts": {
         "check": [
             "@cs-check",
diff --git a/php-zendframework-zend-session.spec b/php-zendframework-zend-session.spec
index eeb2ba4..93c84e7 100644
--- a/php-zendframework-zend-session.spec
+++ b/php-zendframework-zend-session.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    b1486c382decc241de8b1c7778eaf2f0a884f67d
+%global gh_commit    99e46960126cff4054916b6d339f562363e12367
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-session
@@ -20,7 +20,7 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.8.0
+Version:        2.8.1
 Release:        1%{?dist}
 Summary:        Zend Framework %{library} component
 
@@ -44,7 +44,7 @@ BuildRequires:  php-composer(%{gh_owner}/zend-stdlib)           >= 2.5
 # From composer, "require-dev": {
 #        "container-interop/container-interop": "^1.1",
 #        "mongodb/mongodb": "^1.0.1",
-#        "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+#        "phpunit/phpunit": "^5.7.15 || ^6.0.8",
 #        "zendframework/zend-cache": "^2.6.1",
 #        "zendframework/zend-coding-standard": "~1.0.0",
 #        "zendframework/zend-db": "^2.7",
@@ -68,7 +68,7 @@ BuildRequires:  php-composer(%{gh_owner}/zend-loader)           >= 2.5
 %endif
 
 # From composer, "require": {
-#        "php": "^7.0 || ^5.6",
+#        "php": "^5.6 || ^7.0",
 #        "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
 #        "zendframework/zend-stdlib": "^2.7 || ^3.0"
 Requires:       php(language) >= 5.6
@@ -146,9 +146,8 @@ require_once '%{php_home}/Zend/autoload.php';
 require_once __DIR__ . '/../test/autoload.php';
 EOF
 
-# PHP 7.2: ini_set(): Cannot set 'user' save handler by ini_set() or session_module_name()
 ret=0
-for cmd in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71; do
+for cmd in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do
   if which $cmd; then
     set $cmd
     $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1
@@ -169,6 +168,12 @@ exit $ret
 
 
 %changelog
+* Wed Nov 29 2017 Remi Collet <remi@remirepo.net> - 2.8.1-1
+- Update to 2.8.1
+
+* Wed Nov  8 2017 Remi Collet <remi@remirepo.net> - 2.8.0-3
+- fix FTBFS from Koschei, ignore 1 test with PHP 7.2
+
 * Tue Jun 20 2017 Remi Collet <remi@remirepo.net> - 2.8.0-1
 - Update to 2.8.0
 - raise dependency on PHP 5.6
-- 
cgit