use git snapshot 2.3.3-126-g42a2050

diff --git a/eventum-bot-reconnect.patch b/eventum-bot-reconnect.patch
index 66d8c2c84d78eb2ad85089c379aff067a5c9a24c..2f2fe6e6a6adc1ba427f5ec4de79c702ce426494 100644 (file)
--- 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 3bc21c53f0198d36dfacf1129954779e2088d913..868ba045361a102d772e9b12497df5acf78796cf 100644 (file)
--- 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@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 7d8b2333c4a7f0b279614cfa938d10af0b9f9361..f1189583d4bbc040c9fad222fb14f37012d3b952 100644 (file)
--- 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');

diff --git a/eventum.spec b/eventum.spec
index 7483e3aba11bd8be1828e9f333ac4730ec0d4d92..09e77dc014a883ca6a02c3d96156ca9cb577f579 100644 (file)
--- 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