- up to r4470

Changed files:
    eventum-cvs-config.patch -> 1.11
    eventum-order.patch -> 1.32
    eventum.spec -> 1.334

diff --git a/eventum-cvs-config.patch b/eventum-cvs-config.patch
index 89a00946bd5db3969f3c495c3297b4eb0d3a0a42..3bc21c53f0198d36dfacf1129954779e2088d913 100644 (file)
--- a/eventum-cvs-config.patch
+++ b/eventum-cvs-config.patch
@@ -1,7 +1,7 @@
---- eventum-2.2/scm/eventum-cvs-hook~  2009-11-05 17:05:43.000000000 +0200
-+++ eventum-2.2/scm/eventum-cvs-hook   2009-11-05 17:06:26.898467237 +0200
-@@ -27,14 +27,7 @@
- // | Authors: João Prado Maia <jpm@mysql.com>                             |
+--- eventum-2.3.2/scm/eventum-cvs-hook~        2012-02-09 11:27:05.000000000 +0200
++++ eventum-2.3.2/scm/eventum-cvs-hook 2012-02-09 11:29:22.671597765 +0200
+@@ -28,13 +28,7 @@
+ // |          Elan Ruusamäe <glen@delfi.ee>                               |
  // +----------------------------------------------------------------------+
  
 -// URL to your Eventum installation.
@@ -11,10 +11,9 @@
 -//
 -// DO NOT CHANGE ANYTHING AFTER THIS LINE
 -//
--
 +require_once '/etc/eventum/scm.php';
  
- // remove the first element which is the name of this script
+ // save name of this script
  $PROGRAM = basename(array_shift($argv));
 --- eventum-2.2/scm/eventum-svn-hook~  2009-11-10 13:31:10.000000000 +0200
 +++ eventum-2.2/scm/eventum-svn-hook   2009-11-10 13:31:37.571582772 +0200

diff --git a/eventum-order.patch b/eventum-order.patch
index d7fd28ee7d290e357d2fe7e4f200d2b2dd845334..5764514ba18bbecb6b4ef71b611d190aebb24fb3 100644 (file)
--- a/eventum-order.patch
+++ b/eventum-order.patch
@@ -490,8 +490,8 @@
 +      }
 +);
 \ No newline at end of file
---- eventum-2.3.1/htdocs/list.php~     2011-04-20 17:37:25.000000000 +0300
-+++ eventum-2.3.1/htdocs/list.php      2011-04-20 17:40:51.675898467 +0300
+--- eventum-2.3.2/htdocs/list.php~     2012-03-09 18:19:56.000000000 +0200
++++ eventum-2.3.2/htdocs/list.php      2012-03-09 18:32:43.998284397 +0200
 @@ -67,6 +67,11 @@
      }
  }
@@ -501,9 +501,9 @@
 +@$reorder_neworder = $_REQUEST["reorder_neworder"];
 +Issue::reorderUserIssues($reorder_usr_id, $reorder_issue_id, $reorder_neworder);
 +
- $options = Search::saveSearchParams();
- $tpl->assign("options", $options);
- $tpl->assign("sorting", Search::getSortingInfo($options));
+ if (!empty($_REQUEST['nosave'])) {
+       $options = Search::saveSearchParams(false);
+ } else {
 @@ -92,6 +97,24 @@
  }
  $assign_options += $users;

diff --git a/eventum.spec b/eventum.spec
index 4255a60b93ffd1ae9dcfc42123fa62ee19f03343..da64d10a56b69deff0edfad0ee28bd25e7445882 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -10,8 +10,8 @@
 %bcond_without order   # with experimental order patch
 
 %define                php_min_version 5.1.2
-%define                subver  4434
-%define                rel             2.3
+%define                subver  4470
+%define                rel             2.4
 %include       /usr/lib/rpm/macros.php
 Summary:       Eventum Issue / Bug tracking system
 Summary(pl.UTF-8):     Eventum - system śledzenia spraw/błędów
@@ -23,7 +23,7 @@ License:      GPL
 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: 356e710384618aea1e6f3426a41dbc23
+# Source0-md5: 41cdf607a180c5c94abc487a122893ea
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
 Source3:       %{name}-mail-download.cron