[packages/eventum/dev-3.0.4: 1/12] up to 3.0.3-20-g10ba91f; package config symlink to have less patching
glen
glen at pld-linux.org
Wed Oct 28 20:42:13 CET 2015
commit 37f06e5c77bfd4124bea4fbaff071489d72222f7
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Oct 14 11:35:05 2015 +0300
up to 3.0.3-20-g10ba91f; package config symlink to have less patching
autoload.patch | 47 +++++++++++++++++++-------------------
eventum-paths.patch | 66 ++++++-----------------------------------------------
eventum.spec | 16 ++++++++-----
3 files changed, 40 insertions(+), 89 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index 2a246a2..918a432 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -2,9 +2,9 @@
# Conditional build:
%bcond_with order # with experimental order patch
-%define rel 1
-#define subver 105
-#define githash 9c49ee5
+%define rel 1.2
+%define subver 20
+%define githash 10ba91f
%define php_min_version 5.3.3
%include /usr/lib/rpm/macros.php
Summary: Eventum Issue / Bug tracking system
@@ -14,9 +14,9 @@ Version: 3.0.3
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.gz
-# Source0-md5: 0ecee925e49d96cc827e99089848f55a
-#Source0: %{name}-%{version}-%{subver}-g%{githash}.tar.gz
+#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
Source1: %{name}-apache.conf
Source2: %{name}-mail-queue.cron
Source3: %{name}-mail-download.cron
@@ -525,6 +525,8 @@ install -d \
localedir=%{_localedir} \
DESTDIR=$RPM_BUILD_ROOT
+ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
+
install -d $RPM_BUILD_ROOT%{_appdir}/vendor
cp -a vendor/autoload.php vendor/composer $RPM_BUILD_ROOT%{_appdir}/vendor
rm $RPM_BUILD_ROOT%{_appdir}/vendor/composer/include_paths.php
@@ -679,6 +681,8 @@ done
%dir %attr(750,root,root) /var/log/archive/%{name}
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
+%{_appdir}/config
+
%dir %{_appdir}/bin
%attr(755,root,root) %{_appdir}/bin/process_all_emails.php
diff --git a/autoload.patch b/autoload.patch
index bbc6bf0..5e888bf 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -1,5 +1,5 @@
---- eventum-3.0.2-105-g9c49ee5/vendor/composer/autoload_classmap.php~ 2015-10-12 23:36:43.802757372 +0300
-+++ eventum-3.0.2-105-g9c49ee5/vendor/composer/autoload_classmap.php 2015-10-12 23:37:17.072271366 +0300
+--- eventum-3.0.3-13-gfefa325/vendor/composer/autoload_classmap.php~ 2015-10-13 23:35:34.243698812 +0300
++++ eventum-3.0.3-13-gfefa325/vendor/composer/autoload_classmap.php 2015-10-13 23:36:06.729885261 +0300
@@ -4,6 +4,7 @@
$vendorDir = dirname(dirname(__FILE__));
@@ -16,10 +16,10 @@
'Category' => $baseDir . '/lib/eventum/class.category.php',
'Command_Line' => $baseDir . '/lib/eventum/class.command_line.php',
'Contact' => $baseDir . '/lib/eventum/crm/class.contact.php',
-@@ -44,10 +44,7 @@
+@@ -43,10 +43,7 @@
+ 'Email_Account' => $baseDir . '/lib/eventum/class.email_account.php',
'Email_Response' => $baseDir . '/lib/eventum/class.email_response.php',
'Error_Handler' => $baseDir . '/lib/eventum/class.error_handler.php',
- 'Eventum_Autoload' => $baseDir . '/lib/eventum/autoload.php',
- 'Eventum_RPC' => $vendorDir . '/eventum/rpc/class.Eventum_RPC.php',
- 'Eventum_RPC_Exception' => $vendorDir . '/eventum/rpc/class.Eventum_RPC.php',
'FAQ' => $baseDir . '/lib/eventum/class.faq.php',
@@ -248,41 +248,40 @@
- $vendorDir . '/smarty-gettext/smarty-gettext/function.locale.php',
+ $phpDir. '/Smarty3/plugins/block.t.php',
);
---- eventum-3.0.2-101-ge275162/vendor/composer/autoload_namespaces.php 2015-10-12 22:08:53.596910822 +0300
-+++ eventum-3.0.2-101-ge275162/vendor/composer/autoload_namespaces.php 2015-10-12 23:10:35.849016388 +0300
-@@ -4,12 +4,13 @@
+--- 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
+@@ -3,15 +3,16 @@
+ // autoload_namespaces.php @generated by Composer
--$vendorDir = dirname(dirname(__FILE__));
+ $vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
+$pearDir = PEAR_INSTALL_DIR . '/';
-+$phpDir = PHP_DATADIR . '/php';
return array(
+ 'SecurityLib' => array($vendorDir . '/ircmaxell/security-lib/lib'),
+ 'RandomLib' => array($vendorDir . '/ircmaxell/random-lib/lib'),
- 'PEAR' => array($vendorDir . '/pear/pear_exception'),
- 'Net' => array($vendorDir . '/pear/net_smtp'),
- 'Mail' => array($vendorDir . '/pear/mail'),
- 'DB' => array($vendorDir . '/pear/db'),
- 'Auth' => array($vendorDir . '/pear/auth_sasl'),
- '' => array($vendorDir . '/pear/pear-core-minimal/src'),
-+ 'PEAR' => array($pearDir),
-+ 'Net' => array($pearDir),
-+ 'Mail' => array($pearDir),
-+ 'DB' => array($pearDir),
+ 'Auth' => array($pearDir),
-+ 'XML' => array($pearDir),
++ 'DB' => array($pearDir),
++ 'Mail' => array($pearDir),
++ 'Net' => array($pearDir),
++ 'PEAR' => array($pearDir),
+ 'Text' => array($pearDir),
++ 'XML' => array($pearDir),
);
---- eventum-3.0.2-101-ge275162/autoload.php 2015-10-12 22:42:04.697464456 +0300
-+++ eventum-3.0.2-101-ge275162/autoload.php 2015-10-12 22:46:12.383826829 +0300
-@@ -39,7 +39,7 @@
- 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.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');
- return;
- }
+ // fonts directory for phplot
+-define('APP_FONTS_PATH', APP_PATH . '/vendor/fonts/liberation');
++define('APP_FONTS_PATH', '/usr/share/fonts/TTF');
--- eventum-3.0.2-101-ge275162/vendor/composer/autoload_real.php~ 2015-10-12 21:33:13.000000000 +0300
+++ eventum-3.0.2-101-ge275162/vendor/composer/autoload_real.php 2015-10-12 23:14:26.708974755 +0300
@@ -23,20 +23,11 @@
diff --git a/eventum-paths.patch b/eventum-paths.patch
index 59693b4..5fc525b 100644
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,23 +1,5 @@
--- 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
-@@ -28,7 +28,7 @@
- // | Authors: Elan Ruusamäe <glen at delfi.ee> |
- // +----------------------------------------------------------------------+
-
--if (!file_exists(dirname(__FILE__) . '/config/config.php') || !filesize(dirname(__FILE__) . '/config/config.php')) {
-+if (!file_exists('/etc/webapps/eventum/config.php') || !filesize('/etc/webapps/eventum/config.php')) {
- Header('Location: setup/');
- exit(0);
- }
-@@ -45,7 +45,7 @@
- // define base path
- define('APP_PATH', realpath(dirname(__FILE__)));
- if (!defined('APP_CONFIG_PATH')) {
-- define('APP_CONFIG_PATH', APP_PATH . '/config');
-+ define('APP_CONFIG_PATH', '/etc/webapps/eventum');
- }
-
- // include local site config. may override any default
@@ -78,7 +78,7 @@
}
@@ -68,13 +50,13 @@
$error = checkPermissions(APP_SETUP_FILE, "File '" . APP_SETUP_FILE. "'");
if (!empty($error)) {
$errors[] = $error;
---- eventum-2.2/irc/eventum-irc-bot.php~ 2009-07-23 14:03:41.422211655 +0300
-+++ eventum-2.2/irc/eventum-irc-bot.php 2009-07-23 13:54:22.000000000 +0300
-@@ -32,7 +32,7 @@
+--- eventum-3.0.3-13-gfefa325/irc/eventum-irc-bot.php~ 2015-10-13 20:00:48.000000000 +0300
++++ eventum-3.0.3-13-gfefa325/irc/eventum-irc-bot.php 2015-10-13 23:33:33.408818382 +0300
+@@ -31,7 +31,7 @@
ini_set('memory_limit', '1024M');
--require_once dirname(__FILE__) . '/../init.php';
+-require_once __DIR__ . '/../init.php';
+require_once '/usr/share/eventum/init.php';
if (!file_exists(APP_CONFIG_PATH . '/irc_config.php')) {
@@ -103,48 +85,14 @@
'check_permission' => true,
'permission' => 660,
'check_filesize' => true,
---- eventum-2.3.3/config/sphinx.conf.php~ 2012-06-27 14:59:39.000000000 +0300
-+++ eventum-2.3.3/config/sphinx.conf.php 2012-06-27 15:04:52.928810689 +0300
+--- eventum-3.0.3-13-gfefa325/config/sphinx.conf.php~ 2015-10-13 20:00:48.000000000 +0300
++++ eventum-3.0.3-13-gfefa325/config/sphinx.conf.php 2015-10-13 23:34:19.668134549 +0300
@@ -26,7 +26,7 @@
// | Authors: Bryan Alsdorf <bryan at mysql.com> |
// | Authors: Elan Ruusamäe <glen at delfi.ee> |
// +----------------------------------------------------------------------+
--require_once dirname(__FILE__) . "/../init.php";
+-require_once __DIR__ . "/../init.php";
+require_once '/usr/share/eventum/init.php';
if (!defined('SPHINX_LOG_PATH')) {
define('SPHINX_LOG_PATH', '/var/log/sphinx/');
---- eventum-3.0.0-285-g72865b8/autoload.php~ 2015-04-20 23:14:34.904789824 +0300
-+++ eventum-3.0.0-285-g72865b8/autoload.php 2015-04-20 23:22:44.240566443 +0300
-@@ -54,11 +54,11 @@
- */
-
- if (!defined('APP_PEAR_PATH')) {
-- define('APP_PEAR_PATH', '');
-+ define('APP_PEAR_PATH', '/usr/share/pear');
- }
-
- if (!defined('APP_PHP_PATH')) {
-- define('APP_PHP_PATH', '');
-+ define('APP_PHP_PATH', '/usr/share/php');
- }
-
- if (!defined('APP_FONTS_PATH')) {
-@@ -66,7 +66,7 @@
- }
-
- if (!defined('APP_SPHINXAPI_PATH')) {
-- define('APP_SPHINXAPI_PATH', '');
-+ define('APP_SPHINXAPI_PATH', APP_PHP_PATH);
- }
-
- if (!defined('APP_PHP_GETTEXT_PATH')) {
-@@ -74,7 +74,7 @@
- }
-
- if (!defined('APP_SMARTY_PATH')) {
-- define('APP_SMARTY_PATH', '');
-+ define('APP_SMARTY_PATH', APP_PHP_PATH . '/Smarty3');
- }
-
- // add PEAR to the include path, required by PEAR classes
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/7c68bc6269540b4a3d9a35ebd61dae8eeedf1c5d
More information about the pld-cvs-commit
mailing list