packages: eventum/eventum-cvs-config.patch, eventum/eventum-order.patch, ev...

glen glen at pld-linux.org
Tue Nov 10 12:33:10 CET 2009 

Author: glen                         Date: Tue Nov 10 11:33:10 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to r3984

---- Files affected:
packages/eventum:
   eventum-cvs-config.patch (1.9 -> 1.10) , eventum-order.patch (1.26 -> 1.27) , eventum.spec (1.307 -> 1.308) 

---- Diffs:

================================================================
Index: packages/eventum/eventum-cvs-config.patch
diff -u packages/eventum/eventum-cvs-config.patch:1.9 packages/eventum/eventum-cvs-config.patch:1.10
--- packages/eventum/eventum-cvs-config.patch:1.9	Sat Jun 27 17:22:36 2009
+++ packages/eventum/eventum-cvs-config.patch	Tue Nov 10 12:33:05 2009
@@ -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 at 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

================================================================
Index: packages/eventum/eventum-order.patch
diff -u packages/eventum/eventum-order.patch:1.26 packages/eventum/eventum-order.patch:1.27
--- packages/eventum/eventum-order.patch:1.26	Wed Nov  4 21:57:22 2009
+++ packages/eventum/eventum-order.patch	Tue Nov 10 12:33:05 2009
@@ -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 @@

================================================================
Index: packages/eventum/eventum.spec
diff -u packages/eventum/eventum.spec:1.307 packages/eventum/eventum.spec:1.308
--- packages/eventum/eventum.spec:1.307	Wed Nov  4 21:57:22 2009
+++ packages/eventum/eventum.spec	Tue Nov 10 12:33:05 2009
@@ -11,8 +11,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
@@ -28,7 +28,7 @@
 #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
@@ -469,15 +469,6 @@
 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
 
@@ -665,7 +656,7 @@
 %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
@@ -791,6 +782,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.308  2009/11/10 11:33:05  glen
+- up to r3984
+
 Revision 1.307  2009/11/04 20:57:22  glen
 - up to r3966
 - suggest glibc localedb for translations
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-cvs-config.patch?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-order.patch?r1=1.26&r2=1.27&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum.spec?r1=1.307&r2=1.308&f=u

More information about the pld-cvs-commit mailing list