From a5c194b93c018afc877a045829a12c87209fa307 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: May 02 2016 05:53:25 +0000 Subject: load dependencies out of Zend namespaces --- diff --git a/php-zendframework-zend-loader-autoload.php b/php-zendframework-zend-loader-autoload.php index 659144a..e5b7d43 100644 --- a/php-zendframework-zend-loader-autoload.php +++ b/php-zendframework-zend-loader-autoload.php @@ -13,3 +13,15 @@ Zend\Loader\AutoloaderFactory::factory(array( 'autoregister_zf' => true ) )); + +// Dependencies during build +if (defined('RPM_BUILDROOT')) { + foreach(glob(RPM_BUILDROOT . '/*-autoload.php') as $dep) { + require_once $dep; + } +} +// Dependencies outside Zend namespace +foreach(glob(__DIR__ . '/*-autoload.php') as $dep) { + require_once $dep; +} + diff --git a/php-zendframework-zend-loader.spec b/php-zendframework-zend-loader.spec index 1720de2..2e9c9d8 100644 --- a/php-zendframework-zend-loader.spec +++ b/php-zendframework-zend-loader.spec @@ -1,6 +1,6 @@ # remirepo/Fedora spec file for php-zendframework-zend-loader # -# Copyright (c) 2015 Remi Collet +# Copyright (c) 2015-2016 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -16,7 +16,7 @@ Name: php-%{gh_owner}-%{gh_project} Version: 2.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -60,6 +60,7 @@ your application to use the Zend Framework. %install + mkdir -p %{buildroot}%{php_home}/Zend install -pm 644 %{SOURCE1} %{buildroot}%{php_home}/Zend/autoload.php @@ -88,6 +89,9 @@ cp -pr src %{buildroot}%{php_home}/Zend/%{library} %changelog +* Mon May 2 2016 Remi Collet - 2.5.1-3 +- load dependencies out of Zend namespaces + * Thu Feb 04 2016 Fedora Release Engineering - 2.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild