- up to r3984

Changed files:
    eventum-cvs-config.patch -> 1.10
    eventum-order.patch -> 1.27
    eventum.spec -> 1.308

diff --git a/eventum-cvs-config.patch b/eventum-cvs-config.patch
index 4b7a324d86992bbd23591f3b45ca50f782820e4e..89a00946bd5db3969f3c495c3297b4eb0d3a0a42 100644 (file)
--- a/eventum-cvs-config.patch
+++ b/eventum-cvs-config.patch
@@ -1,5 +1,5 @@
---- eventum-r3797/scm/eventum-cvs-hook~        2009-01-13 14:21:31.000000000 +0200
-+++ eventum-r3797/scm/eventum-cvs-hook 2009-01-13 14:22:25.200134375 +0200
+--- 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>                             |
  // +----------------------------------------------------------------------+
@@ -8,29 +8,22 @@
 -// https is supported transparently by PHP 5 if you have openssl module enabled.
 -$eventum_url = 'http://eventum.example.com/';
 -
--
 -//
 -// DO NOT CHANGE ANYTHING AFTER THIS LINE
 -//
-+include '/etc/eventum/scm.php';
+-
++require_once '/etc/eventum/scm.php';
  
- if (isset($eventum_url)) {
-     $data = parse_url($eventum_url);
---- eventum/scm/eventum-svn-hook~      2007-02-17 20:45:06.580266717 +0200
-+++ eventum/scm/eventum-svn-hook       2007-02-17 20:48:25.014819809 +0200
-@@ -33,13 +33,8 @@
+ // remove the first element which is the 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
+@@ -36,7 +36,7 @@
  
- // See http://eventum.mysql.org/wiki/index.php/Subversion_integration about SVN integration.
+ // URL to your Eventum installation.
+ // https is supported transparently by PHP 5 if you have openssl module enabled.
+-$eventum_url = 'http://eventum.example.com/';
++require_once '/etc/eventum/scm.php';
  
--// URL to your Eventum installation.
--// https is supported transparently by PHP 5 if you have openssl module enabled.
--$eventum_url = 'http://rabbit.impleo.net/';
--
--//
--// DO NOT CHANGE ANYTHING AFTER THIS LINE
--//
-+include '/etc/eventum/scm.php';
-+
- if (isset($eventum_url)) {
-     $data = parse_url($eventum_url);
- } else {
+ //
+ // DO NOT CHANGE ANYTHING AFTER THIS LINE

diff --git a/eventum-order.patch b/eventum-order.patch
index 17a1a299e951cb541af02ce8db28fdb35eb40757..072112d3d04c432c21d864e2c57c221b232d83e5 100644 (file)
--- a/eventum-order.patch
+++ b/eventum-order.patch
@@ -495,11 +495,11 @@
  $options = Issue::saveSearchParams();
  $tpl->assign("options", $options);
  $tpl->assign("sorting", Issue::getSortingInfo($options));
-@@ -78,6 +83,21 @@
+@@ -78,6 +83,24 @@
  }
  $assign_options += $users;
  
-+// get the isu_order (assignated users) ordering user
++// get the isu_order (assigned users) ordering user
 +if (!empty($options["users"])) {
 +    if ($options["users"] == -2) {
 +        $isu_order_user = $usr_id;
@@ -512,7 +512,10 @@
 +} else {
 +    unset($isu_order_user);
 +}
-+$tpl->assign("isu_order_user", $isu_order_user);
++
++if (isset($isu_order_user)) {
++    $tpl->assign("isu_order_user", $isu_order_user);
++}
 +
  $list = Issue::getListing($prj_id, $options, $pagerRow, $rows);
  $tpl->assign("list", $list["list"]);
@@ -865,16 +868,16 @@
 +    }
 +    
  }
---- eventum-2.2/templates/header.tpl.html~     2009-11-04 21:14:31.000000000 +0200
-+++ eventum-2.2/templates/header.tpl.html      2009-11-04 21:14:55.177881015 +0200
-@@ -21,6 +21,7 @@
+--- eventum-2.2/templates/header.tpl.html~     2009-11-05 17:04:54.000000000 +0200
++++ eventum-2.2/templates/header.tpl.html      2009-11-05 17:05:17.976837914 +0200
+@@ -18,6 +18,7 @@
  <script type="text/javascript" src="{$rel_url}js/jquery/form.js?c=9984"></script>
  <script type="text/javascript" src="{$rel_url}js/jquery/blockui.js?c=eb13"></script>
  <script type="text/javascript" src="{$rel_url}js/jquery/ui.datepicker.js?c=a911"></script>
 +<script type="text/javascript" src="{$rel_url}js/jquery/jquery.tablednd.js"></script>
- {if $refresh_rate}
- <meta http-equiv="Refresh" content="{$refresh_rate};URL={$rel_url}{$refresh_page}">
- {/if}
+ <script type="text/javascript" src="{$rel_url}js/validation.js?c=901a"></script>
+ <script type="text/javascript" src="{$rel_url}js/browserSniffer.js?c=c046"></script>
+ <script type="text/javascript" src="{$rel_url}js/global.js?c=42a4"></script>
 --- eventum-2.2/templates/list.tpl.html        2009-09-14 18:07:55.000000000 +0300
 +++ eventum-2.2-order/templates/list.tpl.html  2009-10-12 22:10:36.439185157 +0300
 @@ -92,6 +92,28 @@

diff --git a/eventum.spec b/eventum.spec
index a5727cad9d4bbf3224c5885bde8f15d960d50523..cdc284d213e6c4da3b87559f6bf56516334c3294 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -10,8 +10,8 @@
 %bcond_without order   # with experimental order patch
 
 #define        snap    20060921
-%define        rev             r3966
-%define        rel             2.39
+%define        rev             r3984
+%define        rel             2.41
 #define        _rc             RC3
 
 %include       /usr/lib/rpm/macros.php
@@ -27,7 +27,7 @@ Group:                Applications/WWW
 #Source0:      http://mysql.easynet.be/Downloads/eventum/%{name}-%{version}.tar.gz
 # bzr branch lp:eventum eventum && tar -cjf eventum.tar.bz2 --exclude=.bzr --exclude=.bzrignore eventum
 Source0:       %{name}-%{version}-dev-%{rev}.tar.gz
-# Source0-md5: 4ce83d59543ee2e3bfe530e5b4e7d29b
+# Source0-md5: 198d379dd62132a8727308ddfba7e7a3
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
 Source3:       %{name}-mail-download.cron
@@ -468,15 +468,6 @@ EOF
 s;define('CONFIG_PATH'.*');define('CONFIG_PATH', '%{_webappdir}');
 " upgrade/{*/,}*.php
 
-
-install -d examples
-for a in lib/eventum/*/*example*.php; do
-       d=${a%/*} d=${d##lib/eventum/}
-       f=${a##*/}
-       install -d examples/$d
-       mv $a examples/$d/$f
-done
-
 # remove backups from patching as we use globs to package files to buildroot
 find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
 
@@ -664,7 +655,7 @@ fi
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc ChangeLog FAQ INSTALL README UPGRADE CONTRIB
-%doc docs/* examples htdocs/setup/schema.sql mysql-permissions.sql
+%doc docs/* htdocs/setup/schema.sql mysql-permissions.sql
 %attr(751,root,root) %dir %{_webappdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/httpd.conf