commit 59b9fac1ebea393daea4027e65e78d2ccaa99e9e
Author: Elan Ruusamäe <[email protected]>
Date: Fri May 17 00:27:50 2019 +0300
up to 3.7.0
autoload.patch | 10 ++++++----
eventum-paths.patch | 24 ++++++++----------------
eventum.spec | 11 +++++++----
3 files changed, 21 insertions(+), 24 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index 917d775..5430c5e 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -3,18 +3,18 @@
%bcond_with order # with experimental order patch
%define rel 1
-#define subver 36
-#define githash a73f6ae20
+#define subver 73
+#define githash a12094613
%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.7
+Version: 3.7.0
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: b709f674cb815013635c782b2c7e1ed4
+# Source0-md5: 0c6f03267d909ca21b64b2a42d559a7f
#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
@@ -464,9 +464,11 @@ 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
@@ -482,6 +484,7 @@ 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
diff --git a/autoload.patch b/autoload.patch
index 04dbeb0..375e11c 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -58,8 +58,8 @@
'd12685060d57775f2bc3adf90c7d62bd' => $baseDir .
'/lib/eventum/gettext.php',
+ 'b2b3f01361f3aaeab67fde08ae76446f' => $phpDir.
'/Smarty3/plugins/block.t.php',
);
---- eventum-3.6.6-35-gf057f1f6d/vendor/composer/autoload_psr4.php~
2019-04-29 09:17:56.833800940 +0300
-+++ eventum-3.6.6-35-gf057f1f6d/vendor/composer/autoload_psr4.php
2019-04-29 09:18:29.366648505 +0300
+--- eventum-3.7.0/vendor/composer/autoload_psr4.php~ 2019-05-17
00:39:30.859642703 +0300
++++ eventum-3.7.0/vendor/composer/autoload_psr4.php 2019-05-17
00:39:53.749317424 +0300
@@ -4,18 +4,11 @@
$vendorDir = dirname(dirname(__FILE__));
@@ -80,15 +80,17 @@
'Webuni\\CommonMark\\TableExtension\\' => array($vendorDir .
'/webuni/commonmark-table-extension/src'),
'TrueBV\\' => array($vendorDir . '/true/punycode/src'),
'Symfony\\Contracts\\' => array($vendorDir . '/symfony/contracts'),
-@@ -26,12 +26,9 @@
- 'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'),
+@@ -33,14 +33,11 @@
+ 'Symfony\\Bundle\\FrameworkBundle\\' => array($vendorDir .
'/symfony/framework-bundle'),
'Silly\\' => array($vendorDir . '/mnapoli/silly/src'),
'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'),
- 'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
- 'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
+ 'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
'PhpXmlRpc\\' => array($vendorDir . '/phpxmlrpc/phpxmlrpc/src'),
'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'),
'Lossendae\\CommonMark\\TaskLists\\' => array($vendorDir .
'/lossendae/commonmark-task-lists/src'),
'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'),
diff --git a/eventum-paths.patch b/eventum-paths.patch
index b078ccc..108fdb5 100644
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,12 +1,15 @@
---- eventum-3.3.4-365-g65c5538f/globals.php~ 2018-03-13 10:49:12.000000000
+0200
-+++ eventum-3.3.4-365-g65c5538f/globals.php 2018-03-13 23:22:58.153814696
+0200
-@@ -22,7 +22,7 @@
+--- 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');
// define other paths
define('APP_TPL_PATH', APP_PATH . '/templates');
--define('APP_TPL_COMPILE_PATH', APP_VAR_PATH . '/cache');
+ define('APP_TPL_COMPILE_PATH', APP_CACHE_PATH . '/smarty');
-define('APP_LOG_PATH', APP_VAR_PATH . '/log');
-+define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
+define('APP_LOG_PATH', '/var/log/eventum');
define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log');
-define('APP_LOCKS_PATH', APP_VAR_PATH . '/lock');
@@ -70,14 +73,3 @@
/**
* @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);
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/59b9fac1ebea393daea4027e65e78d2ccaa99e9e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
