Author: glen Date: Thu Sep 15 11:14:26 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to r4413
---- Files affected:
packages/eventum:
eventum-paths.patch (1.51 -> 1.52) , eventum.spec (1.328 -> 1.329) ,
update-source.sh (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/eventum/eventum-paths.patch
diff -u packages/eventum/eventum-paths.patch:1.51
packages/eventum/eventum-paths.patch:1.52
--- packages/eventum/eventum-paths.patch:1.51 Thu Sep 15 09:16:24 2011
+++ packages/eventum/eventum-paths.patch Thu Sep 15 13:14:21 2011
@@ -76,8 +76,8 @@
}
if (!defined('APP_ROUTED_MAILS_SAVEDIR')) {
---- eventum-2.2/htdocs/setup/index.php~ 2010-07-28 12:09:26.000000000
+0300
-+++ eventum-2.2/htdocs/setup/index.php 2010-07-28 12:09:48.715993083 +0300
+--- eventum-2.3.1/htdocs/setup/index.php~ 2011-09-15 12:34:21.000000000
+0300
++++ eventum-2.3.1/htdocs/setup/index.php 2011-09-15 12:36:34.061947696
+0300
@@ -42,14 +42,14 @@
define('APP_PATH', realpath(dirname(__FILE__) . '/../..'));
define('APP_INC_PATH', APP_PATH . '/lib/eventum');
@@ -98,11 +98,11 @@
header('Content-Type: text/html; charset=' . APP_CHARSET);
-@@ -252,10 +252,6 @@
- "You need to install this extension for optimal operation. If you
do not install this extension some unicode data will be corrupted.";
+@@ -254,10 +254,6 @@
+ $errors[] = "The 'file_uploads' directive needs to be enabled in your
PHP.INI file in order for Eventum to work properly.";
}
-- $error = checkPermissions(APP_CONFIG_PATH, "Directory '" .
APP_CONFIG_PATH . "'", TRUE);
+- $error = checkPermissions(APP_CONFIG_PATH, "Directory '" .
APP_CONFIG_PATH . "'", true);
- if (!empty($error)) {
- $errors[] = $error;
- }
================================================================
Index: packages/eventum/eventum.spec
diff -u packages/eventum/eventum.spec:1.328 packages/eventum/eventum.spec:1.329
--- packages/eventum/eventum.spec:1.328 Thu Sep 15 09:16:24 2011
+++ packages/eventum/eventum.spec Thu Sep 15 13:14:21 2011
@@ -11,7 +11,7 @@
%bcond_without order # with experimental order patch
%define php_min_version 5.1.2
-%define subver 4409
+%define subver 4413
%define rel 2.1
%include /usr/lib/rpm/macros.php
Summary: Eventum Issue / Bug tracking system
@@ -24,7 +24,7 @@
Group: Applications/WWW
#Source0:
http://launchpad.net/eventum/trunk/%{version}/+download/%{name}-%{version}.tar.gz
Source0: %{name}-%{version}-dev-r%{subver}.tar.gz
-# Source0-md5: f0748322e09459428a853996d8547918
+# Source0-md5: d5b7d65199ebf8b1432f3429532efd07
Source1: %{name}-apache.conf
Source2: %{name}-mail-queue.cron
Source3: %{name}-mail-download.cron
@@ -61,6 +61,7 @@
Requires: php-gd
Requires: php-iconv
Requires: php-imap
+Requires: php-json
Requires: php-mbstring
Requires: php-mysql
Requires: php-pcre
@@ -93,7 +94,7 @@
%define _noautopear pear(../init.php) pear(init.php)
pear(/etc/webapps/.*) pear(%{_appdir}/.*) pear(jpgraph_dir.php)
pear(.*Smarty.class.php) pear(Services/JSON.php) pear(class.date_helper.php)
# exclude optional php dependencies
-%define _noautophp php-gnupg php-hash php-pecl-http
php-json php-tk
+%define _noautophp php-gnupg php-hash php-pecl-http php-tk
%define _noautoreq %{_noautophp} %{_noautopear}
@@ -753,6 +754,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.329 2011/09/15 11:14:21 glen
+- up to r4413
+
Revision 1.328 2011/09/15 07:16:24 glen
- up to bzr4409, with sphinx search support
================================================================
Index: packages/eventum/update-source.sh
diff -u packages/eventum/update-source.sh:1.1
packages/eventum/update-source.sh:1.2
--- packages/eventum/update-source.sh:1.1 Thu Sep 15 09:16:24 2011
+++ packages/eventum/update-source.sh Thu Sep 15 13:14:21 2011
@@ -1,20 +1,25 @@
#!/bin/sh
set -e
dropin=
+specfile=eventum.spec
# Work in package dir
dir=$(dirname "$0")
cd "$dir"
-if [ "$1" ]; then
+if [ -f "$1" ]; then
rev=$1
+ rev=${rev#eventum-*-r}
+ rev=${rev%.tar.gz}
echo "Using $rev..."
-fi
-specfile=eventum.spec
+elif [ "$1" ]; then
+ rev=$1
+ echo "Using $rev..."
+fi
oldrev=$(awk '/^%define[ ]+subver[ ]+/{print $NF}' $specfile)
-if [ "$oldrev" != "$ver" ]; then
+if [ "$oldrev" != "$rev" ]; then
echo "Updating $specfile for $rev"
sed -i -e "
s/^\(%define[ \t]\+subver[ \t]\+\)[0-9]\+\$/\1$rev/
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-paths.patch?r1=1.51&r2=1.52&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum.spec?r1=1.328&r2=1.329&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/update-source.sh?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
