system monolog, symfony/http-foundation

diff --git a/autoload.patch b/autoload.patch
index 6a551e319793f884fbb61c2d467ab83e98e48d32..e84803409b6bfad03705f1c9c5671e1d1c0531f4 100644 (file)
--- a/autoload.patch
+++ b/autoload.patch
@@ -333,19 +333,19 @@
 +    'Text' => array($pearDir),
 +    'XML' => array($pearDir),
  );
---- eventum-3.0.6-327-g34e5417/vendor/composer/autoload_psr4.php~      2015-12-31 19:23:51.000000000 +0200
-+++ eventum-3.0.6-327-g34e5417/vendor/composer/autoload_psr4.php       2015-12-31 19:35:06.415997365 +0200
-@@ -4,9 +4,10 @@
- 
- $vendorDir = dirname(dirname(__FILE__));
+--- eventum-3.0.6-327-g34e5417/vendor/composer/autoload_psr4.php       2015-12-31 19:35:06.415997365 +0200
++++ eventum-3.0.6-327-g34e5417/vendor/composer/autoload_psr4.php       2015-12-31 19:50:20.312351155 +0200
+@@ -6,7 +6,8 @@
  $baseDir = dirname($vendorDir);
 +$phpDir = PHP_DATADIR . '/php';
  
  return array(
 -    'Zend\\Config\\' => array($vendorDir . '/zendframework/zend-config/src'),
+-    'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
+-    'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
 +    'Zend\\Config\\' => array($phpDir . '/Zend/Config'),
-     'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
-     'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
++    'Symfony\\Component\\HttpFoundation\\' => array($phpDir . '/Symfony/Component/HttpFoundation'),
++    'Monolog\\' => array($phpDir . '/Monolog'),
  );
 --- 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

diff --git a/eventum.spec b/eventum.spec
index 1ba9661289c4fa08e40fc10b2f89b6909a7c7e8b..a29b49c12608d94fc94413e90aa36adaececda97 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -2,7 +2,7 @@
 # Conditional build:
 %bcond_with    order   # with experimental order patch
 
-%define                rel             1.2
+%define                rel             1.3
 %define                subver  327
 %define                githash 34e5417
 %define                php_min_version 5.3.7
@@ -68,6 +68,7 @@ Requires:     php(session)
 Requires:      php-Smarty >= 3.1
 Requires:      php-Smarty-plugin-gettext
 Requires:      php-ZendFramework-Config >= 2.4
+Requires:      php-monolog >= 1.17.2
 Requires:      php-pear-DB
 Requires:      php-pear-Mail
 Requires:      php-pear-Mail_Mime
@@ -81,7 +82,8 @@ Requires:     php-pear-Net_UserAgent_Detect
 Requires:      php-pear-PEAR-core
 Requires:      php-pear-Text_Diff
 Requires:      php-pear-XML_RPC
-Requires:      php-psr-Log >= 1.0.0
+Requires:      php-psr-Log >= 1.0.0-2
+Requires:      php-symfony2-HttpFoundation >= 2.7.7
 Requires:      phplot >= 5.8.0
 Requires:      webapps
 Requires:      webserver(access)