[packages/eventum/DEVEL] use git snapshot 2.3.3-126-g42a2050

[glen]

commit 74c64201359c468b23379027151013172f6448f5
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Oct 19 12:26:03 2013 +0300

    use git snapshot 2.3.3-126-g42a2050

 eventum-bot-reconnect.patch |  2 +-
 eventum-cvs-config.patch    |  8 ++++----
 eventum-paths.patch         |  8 ++++----
 eventum.spec                | 20 +++++++-------------
 4 files changed, 16 insertions(+), 22 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index 7483e3a..09e77dc 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -10,21 +10,21 @@
 %bcond_without	order	# with experimental order patch
 
 %define		php_min_version 5.1.2
-%define		subver	4591
-%define		rel		2.11
+%define		subver	126
+%define		githash	42a2050
+%define		rel		4.1
 %include	/usr/lib/rpm/macros.php
 Summary:	Eventum Issue / Bug tracking system
 Summary(pl.UTF-8):	Eventum - system śledzenia spraw/błędów
 Name:		eventum
 Version:	2.3.3
 #Release:	%{rel}
-Release:	%{rel}.bzr%{subver}
+Release:	%{rel}.%{subver}.g%{githash}
 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:	a98dd5ba8dfdb654b3a39314d13eef85
-#Source0:	%{name}-%{version}%{subver}.tar.gz
+Source0:	%{name}-%{version}-%{subver}-g%{githash}.tar.gz
+# Source0-md5:	166b934b2eccd6d70caa2202f44185b0
 Source1:	%{name}-apache.conf
 Source2:	%{name}-mail-queue.cron
 Source3:	%{name}-mail-download.cron
@@ -46,10 +46,6 @@ Patch2:		%{name}-order.patch
 Patch3:		group-users.patch
 Patch4:		https://github.com/glensc/eventum/compare/cf_escape.patch
 # Patch4-md5:	d3d7865b785ebe3b05b18e2005cf843c
-Patch5:		https://github.com/glensc/eventum/compare/ttc_project.patch
-# Patch5-md5:	83e1bead35a2b6778e912d17fdafba20
-Patch6:		https://github.com/glensc/eventum/compare/master...deprecation.patch
-# Patch6-md5:	8595e27df27a8f254ad3761c59930b26
 # packaging patches that probably never go upstream
 Patch100:	%{name}-paths.patch
 Patch101:	%{name}-cvs-config.patch
@@ -459,7 +455,7 @@ Sphinx search integration for Eventum.
 This package contains the cron job.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{subver}-g%{githash}
 
 # GPL v2
 rm docs/COPYING
@@ -474,8 +470,6 @@ rm -r upgrade/{*/,}index.html # not needed in PLD Linux
 %{?with_order:%patch2 -p1}
 %patch3 -p0
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 cp -p %{SOURCE16} htdocs/images
 
diff --git a/eventum-bot-reconnect.patch b/eventum-bot-reconnect.patch
index 66d8c2c..2f2fe6e 100644
--- a/eventum-bot-reconnect.patch
+++ b/eventum-bot-reconnect.patch
@@ -1,5 +1,5 @@
 --- /usr/share/eventum/irc/bot.php	2005-05-17 23:03:42.000000000 +0300
-+++ ./irc/eventum-irc-bot	2005-05-24 14:30:35.000000000 +0300
++++ ./irc/eventum-irc-bot.php	2005-05-24 14:30:35.000000000 +0300
 @@ -367,7 +367,7 @@
  $irc->setLogdestination(SMARTIRC_FILE);
  $irc->setLogfile(APP_IRC_LOG);
diff --git a/eventum-cvs-config.patch b/eventum-cvs-config.patch
index 3bc21c5..868ba04 100644
--- a/eventum-cvs-config.patch
+++ b/eventum-cvs-config.patch
@@ -1,5 +1,5 @@
---- 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
+--- eventum-2.3.2/scm/eventum-cvs-hook.php~	2012-02-09 11:27:05.000000000 +0200
++++ eventum-2.3.2/scm/eventum-cvs-hook.php	2012-02-09 11:29:22.671597765 +0200
 @@ -28,13 +28,7 @@
  // |          Elan Ruusamäe <glen at delfi.ee>                               |
  // +----------------------------------------------------------------------+
@@ -15,8 +15,8 @@
  
  // 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
+--- eventum-2.2/scm/eventum-svn-hook.php~	2009-11-10 13:31:10.000000000 +0200
++++ eventum-2.2/scm/eventum-svn-hook.php	2009-11-10 13:31:37.571582772 +0200
 @@ -36,7 +36,7 @@
  
  // URL to your Eventum installation.
diff --git a/eventum-paths.patch b/eventum-paths.patch
index 7d8b233..f118958 100644
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,5 +1,5 @@
---- ./cli/eventum	2009-06-27 19:46:44.401524716 +0300
-+++ ./cli/eventum	2009-06-27 19:45:22.781438493 +0300
+--- ./cli/eventum.php	2009-06-27 19:46:44.401524716 +0300
++++ ./cli/eventum.php	2009-06-27 19:45:22.781438493 +0300
 @@ -12,9 +12,8 @@
  // @(#) $Id$
  
@@ -120,8 +120,8 @@
      // need to create a random private key variable
      $private_key = '<?php
  $private_key = "' . md5(microtime()) . '";
---- eventum-2.2/irc/eventum-irc-bot~	2009-07-23 14:03:41.422211655 +0300
-+++ eventum-2.2/irc/eventum-irc-bot	2009-07-23 13:54:22.000000000 +0300
+--- eventum-2.2/irc/eventum-irc-bot.php~	2009-07-23 14:03:41.422211655 +0300
++++ eventum-2.2/irc/eventum-irc-bot.php	2009-07-23 13:54:22.000000000 +0300
 @@ -32,7 +32,7 @@
  
  ini_set('memory_limit', '1024M');
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/74c64201359c468b23379027151013172f6448f5