From: Elan Ruusamäe <glen@delfi.ee>
Date: Mon, 24 Aug 2020 11:16:42 +0000 (+0300)
Subject: Up to 3.9.4
X-Git-Tag: auto/th/eventum-3.9.4-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=7d2cac86bb2ca0758e4b9449559e1a81432be8da;p=packages%2Feventum.git

Up to 3.9.4
---

diff --git a/autoload.patch b/autoload.patch
index bade48a..8cc27a8 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -235,8 +235,8 @@
      'd12685060d57775f2bc3adf90c7d62bd' => $baseDir . '/lib/eventum/gettext.php',
 +    'b2b3f01361f3aaeab67fde08ae76446f' => $phpDir. '/Smarty3/plugins/block.t.php',
  );
---- eventum-3.8.5/vendor/composer/autoload_psr4.php~	2019-10-26 04:19:31.788361290 +0300
-+++ eventum-3.8.5/vendor/composer/autoload_psr4.php	2019-10-26 04:53:23.625455791 +0300
+--- eventum-3.9.4/vendor/composer/autoload_psr4.php~	2020-08-24 14:19:46.755998476 +0300
++++ eventum-3.9.4/vendor/composer/autoload_psr4.php	2020-08-24 14:20:11.918973775 +0300
 @@ -4,10 +4,10 @@
  
  $vendorDir = dirname(dirname(__FILE__));
@@ -257,14 +257,14 @@
      'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
      'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
      'Port\\Tests\\' => array($vendorDir . '/portphp/portphp/tests'),
-@@ -64,7 +64,6 @@
+@@ -65,7 +65,6 @@
      'Phlib\\Flysystem\\Pdo\\' => array($vendorDir . '/phlib/flysystem-pdo/src'),
      'Phinx\\' => array($vendorDir . '/robmorgan/phinx/src/Phinx'),
      'PackageVersions\\' => array($vendorDir . '/ocramius/package-versions/src/PackageVersions'),
 -    'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
+     'League\\MimeTypeDetection\\' => array($vendorDir . '/league/mime-type-detection/src'),
      'League\\HTMLToMarkdown\\' => array($vendorDir . '/league/html-to-markdown/src'),
      'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'),
-     'League\\CommonMark\\Ext\\TaskList\\' => array($vendorDir . '/league/commonmark-ext-task-list/src'),
 @@ -45,7 +53,6 @@
      'League\\CommonMark\\' => array($vendorDir . '/league/commonmark/src'),
      'Invoker\\' => array($vendorDir . '/php-di/invoker/src'),
diff --git a/eventum-paths.patch b/eventum-paths.patch
index c940fa1..003fb6b 100644
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,8 +1,11 @@
---- 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';
+--- eventum-3.9.4/src/Config/Paths.php~	2020-08-10 16:32:37.000000000 +0300
++++ eventum-3.9.4/src/Config/Paths.php	2020-08-24 14:18:12.547339038 +0300
+@@ -22,18 +22,16 @@
+     public const APP_PUBLIC_PATH = APP_PATH . '/htdocs';
+     public const APP_INC_PATH = APP_PATH . '/lib/eventum';
+ 
+-    // "/var" path for writable data
+-    private 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';
  
@@ -11,6 +14,7 @@
      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';
+     /** @deprecated */
      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';
@@ -68,22 +72,3 @@
  
      /**
       * @var MountManager
---- eventum-3.9.3/res/services.yml~	2020-07-29 23:40:22.000000000 +0300
-+++ eventum-3.9.3/res/services.yml	2020-08-10 16:29:01.591109700 +0300
-@@ -15,13 +15,13 @@
-   # makes classes in src/ available to be used as services
-   # this creates a service per class whose id is the fully-qualified class name
-   Eventum\:
--    resource: '../src/*'
--    exclude: '../src/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
-+    resource: '/usr/share/eventum/src/*'
-+    exclude: '/usr/share/eventum/src/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
- 
-   # controllers are imported separately to make sure services can be injected
-   # as action arguments even if you don't extend any base controller class
-   Eventum\Controller\:
--    resource: '../src/Controller'
-+    resource: '/usr/share/eventum/src/Controller'
-     tags: ['controller.service_arguments']
- 
-   # add more service definitions when explicit configuration is needed
diff --git a/eventum.spec b/eventum.spec
index 585c61e..218572c 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -9,12 +9,12 @@
 Summary:	Eventum Issue / Bug tracking system
 Summary(pl.UTF-8):	Eventum - system śledzenia spraw/błędów
 Name:		eventum
-Version:	3.9.3
+Version:	3.9.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.xz
-# Source0-md5:	46ed9b3c3b6c07e3d5db5b01ed43684b
+# Source0-md5:	02c1fb442cb445c9003c992a7f2ea019
 #Source0:	https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.xz
 Source1:	%{name}-apache.conf
 Source2:	%{name}-mail-queue.cron