From 662188d314c8959f38466103b328ef5329986434 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sat, 2 Jul 2016 14:16:41 +0200
Subject: php-zendframework-zend-expressive: cleanup

---
 php-zendframework-zend-expressive.spec | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/php-zendframework-zend-expressive.spec b/php-zendframework-zend-expressive.spec
index 7d0874d..f44ce32 100644
--- a/php-zendframework-zend-expressive.spec
+++ b/php-zendframework-zend-expressive.spec
@@ -21,7 +21,7 @@
 
 Name:           php-%{gh_owner}-%{gh_project}
 Version:        1.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        PSR-7 Middleware Microframework based on Stratigility
 
 Group:          Development/Libraries
@@ -59,7 +59,7 @@ BuildRequires:  php-composer(%{gh_owner}/zend-expressive-fastroute)  >= 1.0
 BuildRequires:  php-composer(%{gh_owner}/zend-expressive-zendrouter) >= 1.0
 BuildRequires:  php-composer(%{gh_owner}/zend-servicemanager)        >= 2.6
 # For dependencies autoloader
-BuildRequires:  php-zendframework-zend-loader                        >= 2.5.1-3
+BuildRequires:  php-zendframework-zend-loader                        >= 2.5.1-4
 %endif
 
 # From composer, "require": {
@@ -114,7 +114,7 @@ Suggests:       php-composer(%{gh_owner}/zend-servicemanager)
 %endif
 # Autoloader
 Requires:       php-composer(%{gh_owner}/zend-loader)           >= 2.5
-Requires:       php-zendframework-zend-loader                   >= 2.5.1-3
+Requires:       php-zendframework-zend-loader                   >= 2.5.1-4
 %endif
 
 Provides:       php-composer(%{gh_owner}/%{gh_project}) = %{version}
@@ -142,13 +142,9 @@ Documentation: http://zend-expressive.readthedocs.io/
 
 mv LICENSE.md LICENSE
 
-# psr/http-message also used by aurarouter, fastroute and zendrouter
-
 : Create dependency autoloader
 cat << 'EOF' | tee autoload.php
 <?php
-require_once '%{php_home}/Interop/Container/autoload.php';
-require_once '%{php_home}/Psr/Http/Message/autoload.php';
 if (file_exists('%{php_home}/Aura/Di/autoload.php')) {
    require_once '%{php_home}/Aura/Di/autoload.php';
 }
@@ -197,7 +193,7 @@ if which php56; then
    run=1
 fi
 if which php71; then
-   php70 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1
+   php71 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1
    run=1
 fi
 if [ $run -eq 0 ]; then
@@ -225,6 +221,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jul  2 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-2
+- clean autoloader, rely on zend-loader >= 2.5.1-4
+
 * Sat Jul  2 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-1
 - initial package
 
-- 
cgit