From 72d2e2c9e2f62a4215328892abe3f7959afb3038 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sat, 2 Jul 2016 13:40:54 +0200
Subject: php-zendframework-zend-stratigility: cleanup

---
 php-zendframework-zend-stratigility.spec | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/php-zendframework-zend-stratigility.spec b/php-zendframework-zend-stratigility.spec
index 030ac89..539d632 100644
--- a/php-zendframework-zend-stratigility.spec
+++ b/php-zendframework-zend-stratigility.spec
@@ -21,7 +21,7 @@
 
 Name:           php-%{gh_owner}-%{gh_project}
 Version:        1.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Middleware for PHP
 
 Group:          Development/Libraries
@@ -49,7 +49,7 @@ BuildRequires:  php-composer(phpunit/phpunit)                     >= 4.7
 # Autoloader
 BuildRequires:  php-composer(%{gh_owner}/zend-loader)             >= 2.5
 # 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": {
@@ -72,7 +72,7 @@ Requires:       php-reflection
 Requires:       php-spl
 # 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
 
 Provides:       php-composer(%{gh_owner}/%{gh_project}) = %{version}
 
@@ -95,12 +95,6 @@ It allows you to create and dispatch middleware pipelines.
 
 mv LICENSE.md LICENSE
 
-: Create dependency autoloader
-cat << 'EOF' | tee autoload.php
-<?php
-require_once '%{php_home}/Psr/Http/Message/autoload.php';
-EOF
-
 
 %build
 # Empty build section, nothing required
@@ -112,8 +106,6 @@ rm -rf %{buildroot}
 mkdir -p   %{buildroot}%{php_home}/Zend/
 cp -pr src %{buildroot}%{php_home}/Zend/%{library}
 
-install -m644 autoload.php %{buildroot}%{php_home}/Zend/%{library}-autoload.php
-
 
 %check
 %if %{with_tests}
@@ -136,15 +128,15 @@ EOF
 run=0
 ret=0
 if which php56; then
-   php56 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1
+   php56 %{_bindir}/phpunit || ret=1
    run=1
 fi
 if which php71; then
-   php70 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1
+   php70 %{_bindir}/phpunit || ret=1
    run=1
 fi
 if [ $run -eq 0 ]; then
-%{_bindir}/phpunit --include-path=%{buildroot}%{php_home} --verbose
+%{_bindir}/phpunit --verbose
 # remirepo:2
 fi
 exit $ret
@@ -164,9 +156,11 @@ rm -rf %{buildroot}
 %doc *.md
 %doc composer.json
 %{php_home}/Zend/%{library}
-%{php_home}/Zend/%{library}-autoload.php
 
 
 %changelog
+* Sat Jul  2 2016 Remi Collet <remi@fedoraproject.org> - 1.2.1-2
+- drop autoloader, rely on zend-loader >= 2.5.1-4
+
 * Wed Jun 29 2016 Remi Collet <remi@fedoraproject.org> - 1.2.1-1
 - initial package
-- 
cgit