[packages/eventum/dev-3.0] up to 3.0.0-285-g72865b8, use system phplot
glen
glen at pld-linux.org
Tue Apr 21 10:33:17 CEST 2015
commit 0b88d8579c37c74658e2aa72373a0f222ae7637b
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Apr 20 23:13:42 2015 +0300
up to 3.0.0-285-g72865b8, use system phplot
eventum-paths.patch | 19 ++++++++++++++-----
eventum.spec | 13 +++++--------
2 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index fce005a..ff9884c 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -3,8 +3,8 @@
%bcond_with order # with experimental order patch
%define rel 0.16
-%define subver 262
-%define githash 4b3453d
+%define subver 285
+%define githash 72865b8
%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}-%{subver}/%{name}-%{version}-%{subver}.tar.gz
Source0: %{name}-%{version}-%{subver}-g%{githash}.tar.gz
-# Source0-md5: d571072508b7254ed26dd21e5878ed6c
+# Source0-md5: 77d3f6ef97c3f4567717f7ba0aefd7de
Source1: %{name}-apache.conf
Source2: %{name}-mail-queue.cron
Source3: %{name}-mail-download.cron
@@ -52,9 +52,9 @@ BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.654
BuildRequires: sed >= 4.0
Requires: %{name}-base = %{version}-%{release}
+Requires: fonts-TTF-RedHat-liberation
Requires: php(core) >= %{php_min_version}
Requires: php(filter)
-Requires: php(gd)
Requires: php(iconv)
Requires: php(imap)
Requires: php(json)
@@ -78,6 +78,7 @@ Requires: php-pear-Net_UserAgent_Detect
Requires: php-pear-PEAR-core
Requires: php-pear-Text_Diff
Requires: php-pear-XML_RPC
+Requires: phplot >= 5.8.0
Requires: webapps
Requires: webserver(access)
Requires: webserver(alias)
@@ -523,8 +524,6 @@ cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%{?with_order:cp -a htdocs/ajax $RPM_BUILD_ROOT%{_appdir}/htdocs}
-cp -a vendor $RPM_BUILD_ROOT%{_appdir}
-
touch $RPM_BUILD_ROOT%{_webappdir}/htpasswd
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/apache.conf
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf
@@ -697,8 +696,6 @@ done
%{_appdir}/lib/eventum
%exclude %{_appdir}/lib/eventum/class.monitor.php
-%{_appdir}/vendor
-
%{_examplesdir}/%{name}-%{version}
%{systemdtmpfilesdir}/%{name}.conf
diff --git a/eventum-paths.patch b/eventum-paths.patch
index 7bb7cd8..447d913 100644
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -120,8 +120,8 @@
if (!defined('SPHINX_LOG_PATH')) {
define('SPHINX_LOG_PATH', '/var/log/sphinx/');
---- eventum-3.0.0-pre1-258-g90ba413/autoload.php~ 2015-04-12 21:59:45.000000000 +0300
-+++ eventum-3.0.0-pre1-258-g90ba413/autoload.php 2015-04-19 14:20:30.900010382 +0300
+--- 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 @@
*/
@@ -130,18 +130,27 @@
+ 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', '/usr/share/php');
++ define('APP_SPHINXAPI_PATH', APP_PHP_PATH);
}
if (!defined('APP_PHP_GETTEXT_PATH')) {
-@@ -66,7 +66,7 @@
+@@ -74,7 +74,7 @@
}
if (!defined('APP_SMARTY_PATH')) {
- define('APP_SMARTY_PATH', '');
-+ define('APP_SMARTY_PATH', '/usr/share/php/Smarty3');
++ 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/752f9a2976a44ebdbaa6d19f280d8dda6d9b13f7
More information about the pld-cvs-commit
mailing list