packages: eventum/eventum-order.patch, eventum/eventum-paths.patch, eventum...

glen glen at pld-linux.org
Thu Sep 15 09:16:29 CEST 2011


Author: glen                         Date: Thu Sep 15 07:16:29 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to bzr4409, with sphinx search support

---- Files affected:
packages/eventum:
   eventum-order.patch (1.30 -> 1.31) , eventum-paths.patch (1.50 -> 1.51) , eventum.spec (1.327 -> 1.328) , update-source.sh (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/eventum/eventum-order.patch
diff -u packages/eventum/eventum-order.patch:1.30 packages/eventum/eventum-order.patch:1.31
--- packages/eventum/eventum-order.patch:1.30	Tue Aug 30 21:34:30 2011
+++ packages/eventum/eventum-order.patch	Thu Sep 15 09:16:24 2011
@@ -70,13 +70,12 @@
 +        }
 +    }
 +}
---- eventum-2.2/htdocs/css/style.css~	2009-10-12 22:27:13.000000000 +0300
-+++ eventum-2.2/htdocs/css/style.css	2009-10-12 22:28:31.402712101 +0300
-@@ -176,3 +176,22 @@
- .custom_field {
+--- eventum-2.3.1/htdocs/css/style.css~	2011-09-15 09:36:55.000000000 +0300
++++ eventum-2.3.1/htdocs/css/style.css	2011-09-15 09:38:23.668223576 +0300
+@@ -177,6 +177,24 @@
      cursor: pointer;
  }
-+
+ 
 +.tDnD_whileDrag td {
 +    background-color: #ffffdd;
 +}
@@ -95,6 +94,16 @@
 +    background-repeat: no-repeat;
 +    background-position: center center;
 +}
+ 
+ ul.excerpts {
+     list-style: none;
+@@ -187,4 +205,4 @@
+ ul.excerpts ul {
+     list-style-type: none;
+     padding-left: 1em;
+-}
+\ No newline at end of file
++}
 --- eventum-2.2/htdocs/js/jquery/jquery.tablednd.js	1970-01-01 02:00:00.000000000 +0200
 +++ eventum-2.2-order/htdocs/js/jquery/jquery.tablednd.js	2009-10-12 22:10:36.435851675 +0300
 @@ -0,0 +1,382 @@
@@ -534,23 +543,23 @@
              )
          );
          return $columns[$page];
---- eventum-2.2/lib/eventum/class.issue.php	2009-09-14 18:07:55.000000000 +0300
-+++ eventum-2.2-order/lib/eventum/class.issue.php	2009-10-12 22:10:36.445851670 +0300
-@@ -1333,6 +1333,7 @@
-             Error_Handler::logError(array($res->getMessage(), $res->getDebugInfo()), __FILE__, __LINE__);
+--- eventum-2.3.1/lib/eventum/class.issue.php~	2011-09-15 09:36:55.000000000 +0300
++++ eventum-2.3.1/lib/eventum/class.issue.php	2011-09-15 09:42:02.844032474 +0300
+@@ -1374,6 +1374,7 @@
              return -1;
-         } else {
-+            self::moveOrderForAllUsers($issue_id, 1000);
-             $prj_id = self::getProjectID($issue_id);
+         }
+ 
++        self::moveOrderForAllUsers($issue_id, 1000);
+         $prj_id = self::getProjectID($issue_id);
  
-             // record the change
+         // record the change
 @@ -1800,16 +1801,33 @@
      {
          $issue_id = Misc::escapeInteger($issue_id);
          $assignee_usr_id = Misc::escapeInteger($assignee_usr_id);
 +        $order = 1;
 +        // move all orders down to free "order space" for this new association
-+        $stmt = "UPDATE 
++        $stmt = "UPDATE
 +                    " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "issue_user
 +                 SET
 +                    isu_order = isu_order + 1
@@ -675,14 +684,14 @@
          $stmt = "DELETE FROM
                      " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "issue_user
                   WHERE
-@@ -1883,6 +1975,7 @@
-                 History::add($issue_id, Auth::getUserID(), History::getTypeID('user_unassociated'),
-                     User::getFullName($usr_id) . ' removed from issue by ' . User::getFullName(Auth::getUserID()));
-             }
-+            self::rearrangeDeleteUserAssociationOrderList($delete_order_list);
-             return 1;
+@@ -2020,6 +2021,7 @@
+             History::add($issue_id, Auth::getUserID(), History::getTypeID('user_unassociated'),
+                 User::getFullName($usr_id) . ' removed from issue by ' . User::getFullName(Auth::getUserID()));
          }
++        self::rearrangeDeleteUserAssociationOrderList($delete_order_list);
+         return 1;
      }
+ 
 @@ -3253,6 +3352,8 @@
          $ids = implode(", ", $ids);
          $stmt = "SELECT
@@ -871,16 +880,16 @@
          );
  
          foreach ($custom_fields as $fld_id => $fld_name) {
---- eventum-2.3/templates/header.tpl.html~	2010-09-27 18:12:42.000000000 +0300
-+++ eventum-2.3/templates/header.tpl.html	2010-09-27 18:13:08.884494665 +0300
+--- eventum-2.3.1/templates/header.tpl.html~	2011-09-15 09:36:55.000000000 +0300
++++ eventum-2.3.1/templates/header.tpl.html	2011-09-15 09:43:49.318473817 +0300
 @@ -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>
- <script type="text/javascript" src="{$rel_url}js/validation.js?c=9775"></script>
+ <script type="text/javascript" src="{$rel_url}js/validation.js?c=ad33"></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=5297"></script>
+ <script type="text/javascript" src="{$rel_url}js/global.js?c=50d6"></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-paths.patch
diff -u packages/eventum/eventum-paths.patch:1.50 packages/eventum/eventum-paths.patch:1.51
--- packages/eventum/eventum-paths.patch:1.50	Wed Nov 24 17:24:31 2010
+++ packages/eventum/eventum-paths.patch	Thu Sep 15 09:16:24 2011
@@ -32,7 +32,7 @@
  
  // include local site config. may override any default
  require_once APP_CONFIG_PATH . '/config.php';
-@@ -61,19 +61,15 @@
+@@ -64,23 +64,15 @@
  }
  
  if (!defined('APP_TPL_COMPILE_PATH')) {
@@ -48,6 +48,10 @@
 -    define('APP_PEAR_PATH', APP_PATH . '/lib/pear');
 -}
 -
+-if (!defined('APP_SPHINXAPI_PATH')) {
+-    define('APP_SPHINXAPI_PATH', APP_PATH . '/lib/sphinxapi');
+-}
+-
  if (!defined('APP_SMARTY_PATH')) {
 -    define('APP_SMARTY_PATH', APP_PATH . '/lib/Smarty');
 +    define('APP_SMARTY_PATH', '/usr/share/php/Smarty');
@@ -151,3 +155,12 @@
          'check_permission' => true,
          'permission'       => 660,
          'check_filesize'   => true,
+--- eventum-2.3.1/config/sphinx.conf.php~	2011-09-15 09:35:00.000000000 +0300
++++ eventum-2.3.1/config/sphinx.conf.php	2011-09-15 10:05:10.051918895 +0300
+@@ -1,5 +1,5 @@
+ <?php
+-require_once dirname(__FILE__) . "/../init.php";
++require_once '/usr/share/eventum/init.php';
+ 
+ if (!defined('SPHINX_LOG_PATH')) {
+     define('SPHINX_LOG_PATH', '/var/log/sphinx/');

================================================================
Index: packages/eventum/eventum.spec
diff -u packages/eventum/eventum.spec:1.327 packages/eventum/eventum.spec:1.328
--- packages/eventum/eventum.spec:1.327	Wed Aug 31 17:24:07 2011
+++ packages/eventum/eventum.spec	Thu Sep 15 09:16:24 2011
@@ -11,8 +11,8 @@
 %bcond_without	order	# with experimental order patch
 
 %define		php_min_version 5.1.2
-%define		subver	4371
-%define		rel		1
+%define		subver	4409
+%define		rel		2.1
 %include	/usr/lib/rpm/macros.php
 Summary:	Eventum Issue / Bug tracking system
 Summary(pl.UTF-8):	Eventum - system śledzenia spraw/błędów
@@ -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:	2462dc71b438a4fc4fd1369c69f8fba1
+# Source0-md5:	f0748322e09459428a853996d8547918
 Source1:	%{name}-apache.conf
 Source2:	%{name}-mail-queue.cron
 Source3:	%{name}-mail-download.cron
@@ -492,6 +492,7 @@
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/apache.conf
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf
 cp -p %{SOURCE15} $RPM_BUILD_ROOT%{_webappdir}/lighttpd.conf
+cp -p config/sphinx.conf.php $RPM_BUILD_ROOT%{_webappdir}
 
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}-mail-queue
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/cron.d/%{name}-mail-download
@@ -506,14 +507,14 @@
 cp -p %{SOURCE14} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 
 # postfix router
-install %{SOURCE13} $RPM_BUILD_ROOT%{_libdir}/router-postfix
+install -p %{SOURCE13} $RPM_BUILD_ROOT%{_libdir}/router-postfix
 
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/locale/ht
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ht
 
 %find_lang %{name}
 
 # scm
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/scm.php
+install -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/scm.php
 
 # old compat
 ln -s %{_sbindir}/eventum-cvs-hook $RPM_BUILD_ROOT%{_libdir}/process_cvs_commits
@@ -633,6 +634,7 @@
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/private_key.php
 %attr(660,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/setup.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/htpasswd
+%{_webappdir}/sphinx.conf.php
 
 %dir %attr(731,root,http) /var/log/%{name}
 %attr(620,root,http) %ghost /var/log/%{name}/*
@@ -751,6 +753,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.328  2011/09/15 07:16:24  glen
+- up to bzr4409, with sphinx search support
+
 Revision 1.327  2011/08/31 15:24:07  glen
 - up to r4371
 

================================================================
Index: packages/eventum/update-source.sh
diff -u /dev/null packages/eventum/update-source.sh:1.1
--- /dev/null	Thu Sep 15 09:16:29 2011
+++ packages/eventum/update-source.sh	Thu Sep 15 09:16:24 2011
@@ -0,0 +1,25 @@
+#!/bin/sh
+set -e
+dropin=
+
+# Work in package dir
+dir=$(dirname "$0")
+cd "$dir"
+
+if [ "$1" ]; then
+	rev=$1
+	echo "Using $rev..."
+fi
+
+specfile=eventum.spec
+
+oldrev=$(awk '/^%define[	 ]+subver[	 ]+/{print $NF}' $specfile)
+if [ "$oldrev" != "$ver" ]; then
+	echo "Updating $specfile for $rev"
+	sed -i -e "
+		s/^\(%define[ \t]\+subver[ \t]\+\)[0-9]\+\$/\1$rev/
+	" $specfile
+	../builder -ncs -5 $specfile
+else
+	echo "Already up to date"
+fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-order.patch?r1=1.30&r2=1.31&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-paths.patch?r1=1.50&r2=1.51&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum.spec?r1=1.327&r2=1.328&f=u



More information about the pld-cvs-commit mailing list