[packages/eventum: 2/8] update zf and symfony autoloaders

[glen]

commit 0cca2d24d535c6060e37b463370c28fc0a56472c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Mar 11 10:38:27 2016 +0200

    update zf and symfony autoloaders

 autoload.patch | 33 ++++++++++++++++++++-------------
 eventum.spec   |  2 +-
 2 files changed, 21 insertions(+), 14 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index 895cbd8..02e4d17 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -2,7 +2,7 @@
 # Conditional build:
 %bcond_with	order	# with experimental order patch
 
-%define		rel		1.1
+%define		rel		1.2
 %define		subver  60
 %define		githash 788184f
 %define		php_min_version 5.3.7
diff --git a/autoload.patch b/autoload.patch
index 30ad83b..b220397 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -339,32 +339,39 @@
  );
 --- eventum-3.0.10-60-g788184f/vendor/composer/autoload_psr4.php~	2016-03-11 10:18:46.856708564 +0200
 +++ eventum-3.0.10-60-g788184f/vendor/composer/autoload_psr4.php	2016-03-11 10:18:50.023327584 +0200
-@@ -4,21 +4,22 @@
+@@ -4,20 +4,21 @@
  
  $vendorDir = dirname(dirname(__FILE__));
  $baseDir = dirname($vendorDir);
 +$phpDir = PHP_DATADIR . '/php';
  
  return array(
-     'Zend\\Validator\\' => array($vendorDir . '/zendframework/zend-validator/src'),
-     'Zend\\Mime\\' => array($vendorDir . '/zendframework/zend-mime/src'),
-     'Zend\\Mail\\' => array($vendorDir . '/zendframework/zend-mail/src'),
-     'Zend\\Loader\\' => array($vendorDir . '/zendframework/zend-loader/src'),
+-    'Zend\\Validator\\' => array($vendorDir . '/zendframework/zend-validator/src'),
+-    'Zend\\Mime\\' => array($vendorDir . '/zendframework/zend-mime/src'),
+-    'Zend\\Mail\\' => array($vendorDir . '/zendframework/zend-mail/src'),
+-    'Zend\\Loader\\' => array($vendorDir . '/zendframework/zend-loader/src'),
 -    'Zend\\Config\\' => array($vendorDir . '/zendframework/zend-config/src'),
++    'Zend\\Validator\\' =>  array($phpDir . '/Zend/Validator'),
++    'Zend\\Mime\\' => array($phpDir . '/Zend/Mime'),
++    'Zend\\Mail\\' => array($phpDir . '/Zend/Mail'),
++    'Zend\\Loader\\' => array($phpDir . '/Zend/Loader'),
 +    'Zend\\Config\\' => array($phpDir . '/Zend/Config'),
      'Symfony\\Polyfill\\Php55\\' => array($vendorDir . '/symfony/polyfill-php55'),
-     'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
-     'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'),
-     'Symfony\\Component\\OptionsResolver\\' => array($vendorDir . '/symfony/options-resolver'),
+-    'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
+-    'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'),
+-    'Symfony\\Component\\OptionsResolver\\' => array($vendorDir . '/symfony/options-resolver'),
 -    'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
+-    'Symfony\\Component\\Filesystem\\' => array($vendorDir . '/symfony/filesystem'),
+-    'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'),
++    'Symfony\\Component\\Yaml\\' => array($phpDir . '/Symfony/Component/Yaml'),
++    'Symfony\\Component\\Serializer\\' => array($phpDir . '/Symfony/Component/Serializer'),
++    'Symfony\\Component\\OptionsResolver\\' =>  array($phpDir . '/Symfony/Component/OptionsResolver'),
 +    'Symfony\\Component\\HttpFoundation\\' => array($phpDir . '/Symfony/Component/HttpFoundation'),
-     'Symfony\\Component\\Filesystem\\' => array($vendorDir . '/symfony/filesystem'),
-     'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'),
--    'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
-+    'Monolog\\' => array($phpDir . '/Monolog'),
++    'Symfony\\Component\\Filesystem\\' => array($phpDir . '/Symfony/Component/Filesystem'),
++    'Symfony\\Component\\Config\\' =>  array($phpDir . '/Symfony/Component/Config'),
+     'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
      'Eventum\\' => array($baseDir . '/src'),
      'EmailReplyParser\\' => array($vendorDir . '/willdurand/email-reply-parser/src/EmailReplyParser'),
-     'Cascade\\' => array($vendorDir . '/theorchard/monolog-cascade/src'),
 --- eventum-3.0.3-13-gfefa325/autoload.php~	2015-10-13 21:36:40.000000000 +0300
 +++ eventum-3.0.3-13-gfefa325/autoload.php	2015-10-13 23:39:26.450266254 +0300
 @@ -48,4 +48,4 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/1ea3a6502b8f41ad7de5bcc608d15f8f3645b558