use system psr/log

diff --git a/autoload.patch b/autoload.patch
index 52fd6d20c51ce8607bbba1965fcaa1e70cfffd18..6a551e319793f884fbb61c2d467ab83e98e48d32 100644 (file)
--- a/autoload.patch
+++ b/autoload.patch
@@ -307,11 +307,9 @@
 +    $phpDir. '/Smarty3/plugins/block.t.php',
      $baseDir . '/lib/eventum/gettext.php',
  );
---- eventum-3.0.6-327-g34e5417/vendor/composer/autoload_namespaces.php~        2015-12-31 19:23:51.000000000 +0200
-+++ eventum-3.0.6-327-g34e5417/vendor/composer/autoload_namespaces.php 2015-12-31 19:33:54.323742468 +0200
-@@ -3,16 +3,17 @@
- // autoload_namespaces.php @generated by Composer
- 
+--- eventum-3.0.6-327-g34e5417/vendor/composer/autoload_namespaces.php 2015-12-31 19:33:54.323742468 +0200
++++ eventum-3.0.6-327-g34e5417/vendor/composer/autoload_namespaces.php 2015-12-31 19:46:27.515826070 +0200
+@@ -5,14 +5,15 @@
  $vendorDir = dirname(dirname(__FILE__));
 -$baseDir = dirname($vendorDir);
 +$pearDir = PEAR_INSTALL_DIR . '/';
@@ -319,13 +317,14 @@
  return array(
      'SecurityLib' => array($vendorDir . '/ircmaxell/security-lib/lib'),
      'RandomLib' => array($vendorDir . '/ircmaxell/random-lib/lib'),
-     'Psr\\Log\\' => array($vendorDir . '/psr/log'),
+-    'Psr\\Log\\' => array($vendorDir . '/psr/log'),
 -    'PEAR' => array($vendorDir . '/pear/pear_exception'),
 -    'Net' => array($vendorDir . '/pear/net_smtp'),
 -    'Mail' => array($vendorDir . '/pear/mail'),
 -    'DB' => array($vendorDir . '/pear/db'),
 -    'Auth' => array($vendorDir . '/pear/auth_sasl'),
 -    '' => array($vendorDir . '/pear/pear-core-minimal/src'),
++    'Psr\\Log\\' => array($phpDir),
 +    'Auth' => array($pearDir),
 +    'DB' => array($pearDir),
 +    'Mail' => array($pearDir),

diff --git a/eventum.spec b/eventum.spec
index d074afcf699b5b82ae0ba32ad8c8988d78e8a96f..1ba9661289c4fa08e40fc10b2f89b6909a7c7e8b 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  327
 %define                githash 34e5417
 %define                php_min_version 5.3.7
@@ -81,6 +81,7 @@ 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:      phplot >= 5.8.0
 Requires:      webapps
 Requires:      webserver(access)