up to 3.7.4-440-gcc5ad3db5

diff --git a/autoload.patch b/autoload.patch
index 63559083e469fd86a4fbcfe3b600ebd5592e6007..8e81ec25e2c85f24b9db03f8b9e09a4c423cef4f 100644 (file)
--- a/autoload.patch
+++ b/autoload.patch
@@ -1,5 +1,5 @@
---- eventum-3.7.2-52-g4b3cb3541/vendor/composer/autoload_classmap.php~ 2019-08-02 00:49:33.602293956 +0300
-+++ eventum-3.7.2-52-g4b3cb3541/vendor/composer/autoload_classmap.php  2019-08-02 00:50:28.511499620 +0300
+--- eventum-3.7.4-440-gcc5ad3db5/vendor/composer/autoload_classmap.php~        2019-08-21 23:35:48.930431880 +0300
++++ eventum-3.7.4-440-gcc5ad3db5/vendor/composer/autoload_classmap.php 2019-08-21 23:36:26.853221213 +0300
 @@ -4,6 +4,7 @@
  
  $vendorDir = dirname(dirname(__FILE__));
@@ -17,7 +17,7 @@
      'Pager' => $baseDir . '/lib/eventum/class.pager.php',
      'Partner' => $baseDir . '/lib/eventum/class.partner.php',
      'Phone_Support' => $baseDir . '/lib/eventum/class.phone_support.php',
-@@ -132,13 +132,10 @@
+@@ -128,7 +128,6 @@
      'SebastianBergmann\\Diff\\TimeEfficientLongestCommonSubsequenceCalculator' => $vendorDir . '/sebastian/diff/src/TimeEfficientLongestCommonSubsequenceCalculator.php',
      'Setup' => $baseDir . '/lib/eventum/class.setup.php',
      'Severity' => $baseDir . '/lib/eventum/class.severity.php',
@@ -25,15 +25,10 @@
      'Sphinx_Fulltext_Search' => $baseDir . '/lib/eventum/search/class.sphinx_fulltext_search.php',
      'SqlFormatter' => $vendorDir . '/jdorn/sql-formatter/lib/SqlFormatter.php',
      'Stats' => $baseDir . '/lib/eventum/class.stats.php',
-     'Status' => $baseDir . '/lib/eventum/class.status.php',
--    'StreamReader' => $vendorDir . '/php-gettext/php-gettext/streams.php',
--    'StringReader' => $vendorDir . '/php-gettext/php-gettext/streams.php',
-     'Support' => $baseDir . '/lib/eventum/class.support.php',
-     'SupportLevelNotFoundException' => $baseDir . '/lib/eventum/crm/class.support_level.php',
-     'Support_Level' => $baseDir . '/lib/eventum/crm/class.support_level.php',
-@@ -110,3 +105,7 @@
+@@ -142,4 +141,9 @@
+     'UserSeeder' => $baseDir . '/db/seeds/UserSeeder.php',
+     'Validation' => $baseDir . '/lib/eventum/class.validation.php',
      'Workflow' => $baseDir . '/lib/eventum/class.workflow.php',
--    'gettext_reader' => $vendorDir . '/php-gettext/php-gettext/gettext.php',
 +
 +    // external deps
 +    'PHPlot' => $phpDir .'/phplot/phplot.php',
@@ -104,14 +99,6 @@
 +    'Monolog\\' => array($phpDir . '/Monolog'),
 +    'Psr\\Log\\' => array($phpDir. '/Psr/Log'),
  );
---- 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 @@
- define('APP_PHP_GETTEXT_PATH', APP_PATH . '/vendor/php-gettext/php-gettext');
- 
- // fonts directory for phplot
--define('APP_FONTS_PATH', APP_PATH . '/vendor/fonts/liberation');
-+define('APP_FONTS_PATH', '/usr/share/fonts/TTF');
 --- eventum-3.6.3-29-g154295bd2/vendor/composer/autoload_real.php~     2019-03-26 09:59:16.000000000 +0200
 +++ eventum-3.6.3-29-g154295bd2/vendor/composer/autoload_real.php      2019-03-26 13:18:14.402093309 +0200
 @@ -23,7 +23,7 @@

diff --git a/eventum-gettext.patch b/eventum-gettext.patch
index a1903faa5f312d4891cdfb724f4f49fb9b70fa84..799f918c66613efd2e54b5cc16b1442415db2abf 100644 (file)
--- a/eventum-gettext.patch
+++ b/eventum-gettext.patch
@@ -1,10 +1,10 @@
---- eventum-3.6.1-76-g74f125a7a/lib/eventum/gettext.php~       2019-02-27 17:49:42.000000000 +0200
-+++ eventum-3.6.1-76-g74f125a7a/lib/eventum/gettext.php        2019-03-07 17:18:16.284142306 +0200
-@@ -82,7 +82,6 @@
- }
+--- eventum-3.7.4-440-gcc5ad3db5/./src/Translation.php~        2019-08-12 07:40:03.000000000 +0300
++++ eventum-3.7.4-440-gcc5ad3db5/./src/Translation.php 2019-08-21 23:35:06.911034648 +0300
+@@ -19,7 +19,6 @@
  
- if (defined('APP_PATH')) {
--    _bindtextdomain('eventum', APP_PATH . '/localization/');
-     _bind_textdomain_codeset('eventum', APP_CHARSET);
-     _textdomain('eventum');
- }
+     public static function init(string $domain, string $path = null): void
+     {
+-        bindtextdomain($domain, $path);
+         bind_textdomain_codeset($domain, self::CHARSET);
+         textdomain($domain);
+     }

diff --git a/eventum-paths.patch b/eventum-paths.patch
index f4deebd67ec4713bcd4df02d5cbded151b1908c1..74103f0daf47cfab324549b67d0aaac021c0e489 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,19 +1,24 @@
---- eventum-3.6.7-73-ga12094613/globals.php    2019-05-17 00:29:37.284776088 +0300
-+++ eventum-3.6.7-73-ga12094613/globals.php    2019-05-17 00:30:55.133655597 +0300
-@@ -22,10 +22,8 @@
--// /var path for writable data
--define('APP_VAR_PATH', APP_PATH . '/var');
--define('APP_CACHE_PATH', APP_VAR_PATH . '/cache');
-+define('APP_CACHE_PATH', '/var/cache/eventum');
+--- eventum-3.7.4-440-gcc5ad3db5/src/Config/Paths.php  2019-08-21 23:32:40.826463576 +0300
++++ eventum-3.7.4-440-gcc5ad3db5/src/Config/Paths.php  2019-08-21 23:38:04.548486455 +0300
+@@ -24,14 +24,13 @@
+     // "/var" path for writable data
+-    public const APP_VAR_PATH = APP_PATH . '/var';
+-    public const APP_CACHE_PATH = self::APP_VAR_PATH . '/cache';
++    public const APP_CACHE_PATH = '/var/cache/eventum';
  
- // define other paths
- define('APP_TPL_PATH', APP_PATH . '/templates');
- define('APP_TPL_COMPILE_PATH', APP_CACHE_PATH . '/smarty');
--define('APP_LOG_PATH', APP_VAR_PATH . '/log');
-+define('APP_LOG_PATH', '/var/log/eventum');
- define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log');
--define('APP_LOCKS_PATH', APP_VAR_PATH . '/lock');
-+define('APP_LOCKS_PATH', '/var/run/eventum');
+     // define other paths
+     public const APP_TPL_PATH = APP_PATH . '/templates';
+     public const APP_TPL_COMPILE_PATH = self::APP_CACHE_PATH . '/smarty';
+-    public const APP_LOG_PATH = self::APP_VAR_PATH . '/log';
++    public const APP_LOG_PATH = '/var/log/eventum';
+     public const APP_ERROR_LOG = self::APP_LOG_PATH . '/errors.log';
+-    public const APP_LOCKS_PATH = self::APP_VAR_PATH . '/lock';
++    public const APP_LOCKS_PATH = '/var/run/eventum';
+ 
+     // fonts directory for phplot
+-    public const APP_FONTS_PATH = APP_PATH . '/vendor/fonts/liberation';
++    public const APP_FONTS_PATH = '/usr/share/fonts/TTF';
+ }
 --- eventum-3.5.6-98-g5b87d2b0/src/Setup/Requirements.php~     2019-01-23 01:50:42.000000000 +0200
 +++ eventum-3.5.6-98-g5b87d2b0/src/Setup/Requirements.php      2019-01-24 22:18:56.047816296 +0200
 @@ -64,10 +64,6 @@
@@ -62,14 +67,14 @@
  
  if (!defined('SPHINX_LOG_PATH')) {
      define('SPHINX_LOG_PATH', '/var/log/sphinx/');
---- eventum-3.3.1/src/Attachment/StorageManager.php~   2017-10-08 15:53:56.000000000 +0300
-+++ eventum-3.3.1/src/Attachment/StorageManager.php    2017-10-09 23:22:00.162142738 +0300
-@@ -32,7 +32,7 @@
+--- eventum-3.7.4-440-gcc5ad3db5/src/Attachment/StorageManager.php~    2019-08-11 22:49:07.000000000 +0300
++++ eventum-3.7.4-440-gcc5ad3db5/src/Attachment/StorageManager.php     2019-08-21 23:33:19.325911295 +0300
+@@ -33,7 +33,7 @@
       *
       * @var string
       */
--    const STORAGE_PATH = APP_PATH . '/var/storage/';
-+    const STORAGE_PATH = '/var/lib/eventum/storage/';
+-    private const STORAGE_PATH = Paths::APP_PATH . '/var/storage/';
++    private const STORAGE_PATH = '/var/lib/eventum/storage/';
  
      /**
       * @var MountManager

diff --git a/eventum.spec b/eventum.spec
index 6b364361478cd739826480eda52db91eb82039ed..0a56623a2420f4c4f8b7dfc9ef3a080c95ea00b3 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -3,8 +3,8 @@
 %bcond_with    order   # with experimental order patch
 
 %define                rel             1
-%define                subver  70
-%define                githash f111fb668
+%define                subver  440
+%define                githash cc5ad3db5
 %define                php_min_version 7.1.3
 Summary:       Eventum Issue / Bug tracking system
 Summary(pl.UTF-8):     Eventum - system śledzenia spraw/błędów
@@ -15,7 +15,7 @@ License:      GPL v2+
 Group:         Applications/WWW
 #Source0:      https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.xz
 Source0:       https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.xz
-# Source0-md5: 5b49f9457fb94f6740234507d7689c8d
+# Source0-md5: 80fbe561a3f4e0bad81d8ff3d679ae39
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
 Source3:       %{name}-mail-download.cron
@@ -307,7 +307,6 @@ rm config/config.dist.php
 # cleanup libs taken from system, everything else gets bundled
 rm -r vendor/fonts/liberation
 rm -r vendor/monolog/monolog
-rm -r vendor/php-gettext/php-gettext
 rm -r vendor/phplot/phplot
 rm -r vendor/psr/log
 rm -r vendor/smarty-gettext/smarty-gettext