up to 3.1.4

diff --git a/autoload.patch b/autoload.patch
index d2e2105c4b8133800d664061f1c30f8dbd83b1ba..7ab87d1280fbd6e34afe149c4d28ef8feecd0133 100644 (file)
--- a/autoload.patch
+++ b/autoload.patch
@@ -338,29 +338,15 @@
 +    'Text' => array($pearDir),
 +    'XML' => array($pearDir),
 +);
---- eventum-3.1.3/vendor/composer/autoload_psr4.php~   2016-09-25 21:27:02.000000000 +0300
-+++ eventum-3.1.3/vendor/composer/autoload_psr4.php    2016-09-25 21:54:10.153351072 +0300
-@@ -4,22 +4,23 @@
+--- eventum-3.1.4/vendor/composer/autoload_psr4.php~   2016-10-26 22:02:08.000000000 +0300
++++ eventum-3.1.4/vendor/composer/autoload_psr4.php    2016-10-27 16:54:25.728781171 +0300
+@@ -4,23 +4,24 @@
  
  $vendorDir = dirname(dirname(__FILE__));
  $baseDir = dirname($vendorDir);
 +$phpDir = PHP_DATADIR . '/php';
  
  return array(
--    'Zend\\Validator\\' => array($vendorDir . '/zendframework/zend-validator/src'),
--    'Zend\\Stdlib\\' => array($vendorDir . '/zendframework/zend-stdlib/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'),
--    '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'),
--    'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
--    'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
 +    'Zend\\Validator\\' =>  array($phpDir . '/Zend/Validator'),
 +    'Zend\\Stdlib\\' => array($phpDir . '/Zend/Stdlib'),
 +    'Zend\\Mime\\' => array($phpDir . '/Zend/Mime'),
@@ -375,6 +361,21 @@
 +    'Symfony\\Component\\Config\\' =>  array($phpDir . '/Symfony/Component/Config'),
 +    'Monolog\\' => array($phpDir . '/Monolog'),
 +    'Psr\\Log\\' => array($phpDir. '/Psr/Log'),
+     'malkusch\\lock\\' => array($vendorDir . '/malkusch/lock/classes'),
+-    'Zend\\Validator\\' => array($vendorDir . '/zendframework/zend-validator/src'),
+-    'Zend\\Stdlib\\' => array($vendorDir . '/zendframework/zend-stdlib/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'),
+-    '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'),
+-    'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
+-    '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'),
@@ -386,17 +387,18 @@
  // fonts directory for phplot
 -define('APP_FONTS_PATH', APP_PATH . '/vendor/fonts/liberation');
 +define('APP_FONTS_PATH', '/usr/share/fonts/TTF');
---- eventum-3.1.3/vendor/composer/autoload_real.php~   2016-09-25 21:27:02.000000000 +0300
-+++ eventum-3.1.3/vendor/composer/autoload_real.php    2016-09-25 21:55:26.295565465 +0300
+--- eventum-3.1.4/vendor/composer/autoload_real.php~   2016-10-26 22:02:08.000000000 +0300
++++ eventum-3.1.4/vendor/composer/autoload_real.php    2016-10-27 16:55:16.684709131 +0300
 @@ -23,11 +23,7 @@
          self::$loader = $loader = new \Composer\Autoload\ClassLoader();
          spl_autoload_unregister(array('ComposerAutoloaderInitEventumCore', 'loadClassLoader'));
  
 -        $includePaths = require __DIR__ . '/include_paths.php';
 -        array_push($includePaths, get_include_path());
--        set_include_path(join(PATH_SEPARATOR, $includePaths));
+-        set_include_path(implode(PATH_SEPARATOR, $includePaths));
 -
 -        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
 +        $useStaticLoader = false; // TODO: patch autoload_static.php as well
          if ($useStaticLoader) {
              require_once __DIR__ . '/autoload_static.php';
+ 

diff --git a/eventum.spec b/eventum.spec
index 7d18d896b346d100b5357a8159fea24432b8025e..ac3a45b6343e1493cddd46fd946bd84a0abb587a 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -10,12 +10,12 @@
 Summary:       Eventum Issue / Bug tracking system
 Summary(pl.UTF-8):     Eventum - system śledzenia spraw/błędów
 Name:          eventum
-Version:       3.1.3
+Version:       3.1.4
 Release:       %{?subver:1.%{subver}.%{?githash:g%{githash}.}}%{rel}
 License:       GPL v2+
 Group:         Applications/WWW
 Source0:       https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 23b9d81da34d7556e06f09fef81bdc7e
+# Source0-md5: 3dd1a7d3a6a496bbd57f3e11d2fcb6f1
 #Source0:      %{name}-%{version}-%{subver}-g%{githash}.tar.gz
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
@@ -413,6 +413,7 @@ vendor ircmaxell/{random-lib,security-lib}
 vendor defuse/php-encryption
 vendor willdurand/email-reply-parser
 vendor theorchard/monolog-cascade
+vendor malkusch/lock
 
 # remove backups from patching as we use globs to package files to buildroot
 find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v