up to 3.6.5

diff --git a/autoload.patch b/autoload.patch
index 1bf67db7426f265c63b4972087f27a3846d46780..032fe1f19bc6602c73ea62330a967e0c600014fa 100644 (file)
--- a/autoload.patch
+++ b/autoload.patch
@@ -57,8 +57,8 @@
      'd12685060d57775f2bc3adf90c7d62bd' => $baseDir . '/lib/eventum/gettext.php',
 +    'b2b3f01361f3aaeab67fde08ae76446f' => $phpDir. '/Smarty3/plugins/block.t.php',
  );
---- eventum-3.6.3-37-ga8d4c81db/vendor/composer/autoload_psr4.php~     2019-03-28 23:36:47.697875133 +0200
-+++ eventum-3.6.3-37-ga8d4c81db/vendor/composer/autoload_psr4.php      2019-03-28 23:37:22.690724043 +0200
+--- eventum-3.6.5/vendor/composer/autoload_psr4.php~   2019-04-08 13:06:08.567069724 +0300
++++ eventum-3.6.5/vendor/composer/autoload_psr4.php    2019-04-08 13:06:31.383421815 +0300
 @@ -4,18 +4,11 @@
  
  $vendorDir = dirname(dirname(__FILE__));
@@ -92,11 +92,11 @@
      'Lossendae\\CommonMark\\TaskLists\\' => array($vendorDir . '/lossendae/commonmark-task-lists/src'),
      'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'),
      'League\\CommonMark\\Ext\\InlinesOnly\\' => array($vendorDir . '/league/commonmark-ext-inlines-only/src'),
-@@ -55,7 +45,6 @@
+@@ -34,7 +34,6 @@
      'League\\CommonMark\\Ext\\Autolink\\' => array($vendorDir . '/league/commonmark-ext-autolink/src'),
      'League\\CommonMark\\' => array($vendorDir . '/league/commonmark/src'),
      'Invoker\\' => array($vendorDir . '/php-di/invoker/src'),
--    'Eventum\\Test\\' => array($baseDir . '/tests', $baseDir . '/tests/src'),
+-    'Eventum\\Test\\' => array($baseDir . '/tests'),
      'Eventum\\' => array($baseDir . '/src'),
      'EmailReplyParser\\' => array($vendorDir . '/willdurand/email-reply-parser/src/EmailReplyParser'),
      'Ds\\' => array($vendorDir . '/php-ds/php-ds/src'),

diff --git a/eventum-paths.patch b/eventum-paths.patch
index c563eafbf187d4481e3bdd16e47804ef9c5c44b0..b078ccc416c1fcc859205e6dfd2fe324ed655fbe 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -70,3 +70,14 @@
  
      /**
       * @var MountManager
+--- eventum-3.6.5/src/Db/Doctrine.php~ 2019-03-23 21:53:29.000000000 +0200
++++ eventum-3.6.5/src/Db/Doctrine.php  2019-04-08 13:08:37.751679436 +0300
+@@ -64,7 +64,7 @@
+         ];
+ 
+         $cacheDriver = new Cache\ArrayCache();
+-        $proxyDir = APP_VAR_PATH . '/cache/doctrine/proxies';
++        $proxyDir = '/var/cache/eventum/doctrine/proxies';
+ 
+         $config = Setup::createAnnotationMetadataConfiguration($paths, $isDevMode, $proxyDir, $cache = null, $useSimpleAnnotationReader = false);
+ 

diff --git a/eventum.spec b/eventum.spec
index d6f70b1341a1f9c45ae1848e9738207ef1a71f01..4fbe457e610e8f2747db399aadc04e2c64a32991 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -3,19 +3,19 @@
 %bcond_with    order   # with experimental order patch
 
 %define                rel             1
-%define                subver  11
-%define                githash de1c95975
+#define                subver  11
+#define                githash de1c95975
 %define                php_min_version 7.1.3
 Summary:       Eventum Issue / Bug tracking system
 Summary(pl.UTF-8):     Eventum - system śledzenia spraw/błędów
 Name:          eventum
-Version:       3.6.4
+Version:       3.6.5
 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:       https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.xz
-# Source0-md5: 4d371a3262a4be9a6368ed9ed53ac2fc
+Source0:       https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: 271c0ca19f30505e74810fdbffc1609d
+#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
 Source3:       %{name}-mail-download.cron
@@ -338,9 +338,10 @@ rm -rf $RPM_BUILD_ROOT
 install -d \
        $RPM_BUILD_ROOT{%{_webappdir}/{custom_field,templates,workflow},%{_sysconfdir},%{_bindir},%{_sbindir},%{_libdir}} \
        $RPM_BUILD_ROOT/etc/{rc.d/init.d,cron.d,logrotate.d,sysconfig} \
-       $RPM_BUILD_ROOT/var/{run,cache,lib}/%{name} \
+       $RPM_BUILD_ROOT/var/{run,lib}/%{name} \
        $RPM_BUILD_ROOT/var/log/{archive/,}%{name} \
        $RPM_BUILD_ROOT/var/lib/%{name}/{routed_{emails,drafts,notes},storage} \
+       $RPM_BUILD_ROOT/var/cache/%{name}/doctrine/proxies \
        $RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
 %{__make} install-eventum install-localization \
@@ -463,11 +464,9 @@ fi
 %attr(751,root,http) %dir %{_webappdir}/partner
 %attr(751,root,http) %dir %{_webappdir}/templates
 %attr(751,root,http) %dir %{_webappdir}/workflow
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/bundles.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/config.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/htpasswd
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/private_key.php
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/routes.yml
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/secret_key.php
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/httpd.conf
@@ -483,7 +482,6 @@ fi
 %{_appdir}/config
 
 %dir %{_appdir}/bin
-%attr(755,root,root) %{_appdir}/bin/console.php
 %attr(755,root,root) %{_appdir}/bin/extension.php
 %attr(755,root,root) %{_appdir}/bin/ldapsync.php
 %attr(755,root,root) %{_appdir}/bin/migrate_storage_adapter.php
@@ -511,6 +509,8 @@ fi
 %dir %{_appdir}/db
 %dir %{_appdir}/db/migrations
 %{_appdir}/db/migrations/*.php
+%dir %{_appdir}/db/seeds
+%{_appdir}/db/seeds/*.php
 
 %{_appdir}/res
 %{_appdir}/src
@@ -530,6 +530,8 @@ fi
 %dir /var/lib/%{name}
 %dir %attr(730,root,http) /var/run/%{name}
 %dir %attr(730,root,http) /var/cache/%{name}
+%dir %attr(730,root,http) /var/cache/%{name}/doctrine
+%dir %attr(730,root,http) /var/cache/%{name}/doctrine/proxies
 
 # saved mail copies
 %attr(770,root,http) %dir /var/lib/%{name}/routed_emails