up to 2.3.4

Merge branch 'DEVEL'

Conflicts:
	eventum.spec

diff --cc eventum.spec
index e68944f1e9ec8fd042731ffa13baa6c6e6eb989b,59196d44bcd9ce7caa70467efb75b77793404717..17ad9b7c4422b6efd91f847f1c850b81c15e7726
--- 1/eventum.spec
--- 2/eventum.spec
+++ b/eventum.spec
@@@ -10,21 -10,21 +10,16 @@@
  %bcond_without        order   # with experimental order patch
  
  %define               php_min_version 5.1.2
- #define               subver  RC3
- %define               rel             4
 -%define               subver  148
 -%define               githash 78b3368
 -%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}
 -Release:      %{rel}.%{subver}.g%{githash}
 -License:      GPL
++Version:      2.3.4
++Release:      1
 +License:      GPL v2
  Group:                Applications/WWW
- Source0:      http://launchpad.net/eventum/trunk/%{version}/+download/%{name}-%{version}.tar.gz
- # Source0-md5:        e1a5097d191468061865065678665f0e
- #Source0:     %{name}-%{version}-dev-r%{subver}.tar.gz
- #Source0:     %{name}-%{version}%{subver}.tar.gz
 -#Source0:     http://launchpad.net/eventum/trunk/%{version}/+download/%{name}-%{version}.tar.gz
 -Source0:      %{name}-%{version}-%{subver}-g%{githash}.tar.gz
 -# Source0-md5:        b2ba583bf2eac981bea70cfe41756f8e
++Source0:      https://launchpad.net/eventum/trunk/%{version}/+download/%{name}-%{version}.tar.gz
++# Source0-md5:        f64a6cd054356513f6ff701be765600e
  Source1:      %{name}-apache.conf
  Source2:      %{name}-mail-queue.cron
  Source3:      %{name}-mail-download.cron