update zf and symfony autoloaders

diff --git a/autoload.patch b/autoload.patch
index 30ad83b840af8ec05b45bebf8bbef8c00b9b8141..b220397c189213784e835d82295bc90567243e4a 100644 (file)
--- 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 @@

diff --git a/eventum.spec b/eventum.spec
index 895cbd8cdd9154dc51fed8085d2e41120f5e2d2a..02e4d174aee53caf9e98ec69b5bfb7ec13b9209a 100644 (file)
--- 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