[packages/eventum/dev-3.0.4: 3/12] up to eventum-3.0.3-120-g0b3339c
glen
glen at pld-linux.org
Wed Oct 28 20:42:23 CET 2015
commit b01e96c4b990761d1065fc0668944c583aa91f37
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Oct 19 23:41:02 2015 +0300
up to eventum-3.0.3-120-g0b3339c
package compat libs from vendor
autoload.patch | 10 +++++++---
eventum-paths.patch | 41 ++++++++++++++++-------------------------
eventum.spec | 14 ++++++++++----
3 files changed, 33 insertions(+), 32 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index f01a910..7c8376b 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -3,8 +3,8 @@
%bcond_with order # with experimental order patch
%define rel 1.3
-%define subver 20
-%define githash 10ba91f
+%define subver 120
+%define githash 0b3339c
%define php_min_version 5.3.3
%include /usr/lib/rpm/macros.php
Summary: Eventum Issue / Bug tracking system
@@ -16,7 +16,7 @@ License: GPL v2
Group: Applications/WWW
#Source0: https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source0: %{name}-%{version}-%{subver}-g%{githash}.tar.gz
-# Source0-md5: cb47e604e10272c9b73e70a1464b4806
+# Source0-md5: dced95de62683ee778f51862cf4dde38
Source1: %{name}-apache.conf
Source2: %{name}-mail-queue.cron
Source3: %{name}-mail-download.cron
@@ -527,10 +527,11 @@ install -d \
ln -s %{_webappdir} $RPM_BUILD_ROOT%{_appdir}/config
-install -d $RPM_BUILD_ROOT%{_appdir}/vendor
+install -d $RPM_BUILD_ROOT%{_appdir}/vendor/ircmaxell
cp -a vendor/autoload.php vendor/composer $RPM_BUILD_ROOT%{_appdir}/vendor
rm $RPM_BUILD_ROOT%{_appdir}/vendor/composer/include_paths.php
rm $RPM_BUILD_ROOT%{_appdir}/vendor/composer/autoload_psr4.php
+cp -a vendor/ircmaxell/{password-compat,random-lib,security-lib} $RPM_BUILD_ROOT%{_appdir}/vendor/ircmaxell
# unsupported locale
%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ht
@@ -718,6 +719,11 @@ done
%{_appdir}/vendor/composer/ClassLoader.php
%{_appdir}/vendor/composer/autoload_*.php
+%dir %{_appdir}/vendor/ircmaxell
+%{_appdir}/vendor/ircmaxell/password-compat
+%{_appdir}/vendor/ircmaxell/random-lib
+%{_appdir}/vendor/ircmaxell/security-lib
+
%dir %{_appdir}/lib
%{_appdir}/lib/eventum
%exclude %{_appdir}/lib/eventum/class.monitor.php
diff --git a/autoload.patch b/autoload.patch
index 5e888bf..2d7763d 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -237,16 +237,20 @@
+ 'Smarty' => $phpDir. '/Smarty3/Smarty.class.php',
+ 'SphinxClient' => $phpDir . '/sphinxapi.php',
);
---- eventum-3.0.2-101-ge275162/vendor/composer/autoload_files.php 2015-10-12 22:06:43.978822341 +0300
-+++ eventum-3.0.2-101-ge275162/vendor/composer/autoload_files.php 2015-10-12 22:06:43.978822341 +0300
-@@ -6,6 +6,6 @@
+--- eventum-3.0.3-118-g751b8cc/vendor/composer/autoload_files.php~ 2015-10-19 22:57:36.000000000 +0300
++++ eventum-3.0.3-118-g751b8cc/vendor/composer/autoload_files.php 2015-10-19 23:01:26.239594821 +0300
+@@ -4,10 +4,10 @@
+
+ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
+$phpDir = PHP_DATADIR . '/php';
return array(
+ $vendorDir . '/ircmaxell/password-compat/lib/password.php',
- $vendorDir . '/smarty-gettext/smarty-gettext/block.t.php',
- $vendorDir . '/smarty-gettext/smarty-gettext/function.locale.php',
+ $phpDir. '/Smarty3/plugins/block.t.php',
+ $baseDir . '/lib/eventum/gettext.php',
);
--- eventum-3.0.3-13-gfefa325/vendor/composer/autoload_namespaces.php.old 2015-10-13 22:57:18.000000000 +0300
+++ eventum-3.0.3-13-gfefa325/vendor/composer/autoload_namespaces.php 2015-10-13 23:38:11.988033704 +0300
diff --git a/eventum-paths.patch b/eventum-paths.patch
index 5fc525b..ca0fc52 100644
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,28 +1,19 @@
---- eventum-3.0.2-28-g0d12f69.old/init.php 2015-09-14 13:20:59.450996838 +0300
-+++ eventum-3.0.2-28-g0d12f69/init.php 2015-09-11 23:17:34.000000000 +0300
-@@ -78,7 +78,7 @@
- }
-
- if (!defined('APP_TPL_COMPILE_PATH')) {
-- define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c');
-+ define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
- }
-
- if (!defined('APP_INC_PATH')) {
-@@ -86,11 +86,11 @@
- }
-
- if (!defined('APP_LOCKS_PATH')) {
-- define('APP_LOCKS_PATH', APP_PATH . '/locks');
-+ define('APP_LOCKS_PATH', '/var/run/eventum/');
- }
-
- if (!defined('APP_LOG_PATH')) {
-- define('APP_LOG_PATH', APP_PATH . '/logs');
-+ define('APP_LOG_PATH', '/var/log/eventum');
- }
-
- if (!defined('APP_ERROR_LOG')) {
+--- eventum-3.0.3-118-g751b8cc/init.php~ 2015-10-19 22:56:35.000000000 +0300
++++ eventum-3.0.3-118-g751b8cc/init.php 2015-10-19 23:00:17.390607216 +0300
+@@ -72,10 +72,10 @@
+ // define other paths
+ $define('APP_SETUP_FILE', APP_CONFIG_PATH . '/setup.php');
+ $define('APP_TPL_PATH', APP_PATH . '/templates');
+-$define('APP_TPL_COMPILE_PATH', APP_PATH . '/templates_c');
++$define('APP_TPL_COMPILE_PATH', '/var/cache/eventum');
+ $define('APP_INC_PATH', APP_PATH . '/lib/eventum');
+-$define('APP_LOCKS_PATH', APP_PATH . '/locks');
+-$define('APP_LOG_PATH', APP_PATH . '/logs');
++$define('APP_LOCKS_PATH', APP_PATH . '/var/run/eventum');
++$define('APP_LOG_PATH', '/var/log/eventum');
+ $define('APP_ERROR_LOG', APP_LOG_PATH . '/errors.log');
+ $define('APP_CLI_LOG', APP_LOG_PATH . '/cli.log');
+ $define('APP_IRC_LOG', APP_LOG_PATH . '/irc_bot.log');
--- eventum-3.0.0/htdocs/setup/index.php~ 2015-02-02 20:03:49.507010317 +0200
+++ eventum-3.0.0/htdocs/setup/index.php 2015-02-02 20:05:00.139257552 +0200
@@ -44,10 +44,10 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/7c68bc6269540b4a3d9a35ebd61dae8eeedf1c5d
More information about the pld-cvs-commit
mailing list