- up to r4128

Changed files:
    eventum-order.patch -> 1.28
    eventum-paths.patch -> 1.48
    eventum.spec -> 1.318

diff --git a/eventum-order.patch b/eventum-order.patch
index 072112d3d04c432c21d864e2c57c221b232d83e5..68131783e74a1c84783aefdc82ed138520bfd65d 100644 (file)
--- a/eventum-order.patch
+++ b/eventum-order.patch
@@ -868,16 +868,16 @@
 +    }
 +    
  }
---- 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
+--- eventum-2.2/templates/header.tpl.html~     2010-07-28 12:08:00.000000000 +0300
++++ eventum-2.2/templates/header.tpl.html      2010-07-28 12:08:57.059079749 +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=901a"></script>
+ <script type="text/javascript" src="{$rel_url}js/validation.js?c=7eb3"></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>
+ <script type="text/javascript" src="{$rel_url}js/global.js?c=5297"></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 @@

diff --git a/eventum-paths.patch b/eventum-paths.patch
index 976d4a99ef57897e3c7aa2e39be5e68c95cb9a08..2050115f742be6f245a41f446a8e6af7f15f5093 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -82,8 +82,8 @@
  }
  
  if (!defined('APP_ROUTED_MAILS_SAVEDIR')) {
---- eventum-2.2/htdocs/setup/index.php~        2009-10-12 22:41:28.000000000 +0300
-+++ eventum-2.2/htdocs/setup/index.php 2009-10-12 22:43:06.524225893 +0300
+--- eventum-2.2/htdocs/setup/index.php~        2010-07-28 12:09:26.000000000 +0300
++++ eventum-2.2/htdocs/setup/index.php 2010-07-28 12:09:48.715993083 +0300
 @@ -42,14 +42,14 @@
  define('APP_PATH', realpath(dirname(__FILE__) . '/../..'));
  define('APP_INC_PATH', APP_PATH . '/lib/eventum');
@@ -104,10 +104,10 @@
  
  header('Content-Type: text/html; charset=' . APP_CHARSET);
  
-@@ -241,10 +241,6 @@
-         $warnings[] = "The Multibyte String Functions extension is not enabled in your PHP installation. For localization to work properly " .
-             "you need to install this extension. If you do not install this extension localization will be disabled.";
+@@ -252,10 +252,6 @@
+             "You need to install this extension for optimal operation. If you do not install this extension some unicode data will be corrupted.";
      }
+ 
 -    $error = checkPermissions(APP_CONFIG_PATH, "Directory '" . APP_CONFIG_PATH . "'", TRUE);
 -    if (!empty($error)) {
 -        $errors[] = $error;

diff --git a/eventum.spec b/eventum.spec
index a79ddab51793ace825a2585b1a9335cc6b22bdf4..546507b8fe6e8c8bd70dbbb1ce10b95e2f073388 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -10,8 +10,8 @@
 %bcond_without order   # with experimental order patch
 
 #define        snap    20060921
-%define        rev             r4097
-%define        rel             2.67
+%define        rev             r4128
+%define        rel             2.68
 #define        _rc             RC3
 
 %define                php_min_version 5.1.2
@@ -28,7 +28,7 @@ Group:                Applications/WWW
 #Source0:      http://mysql.easynet.be/Downloads/eventum/%{name}-%{version}.tar.gz
 # bzr branch lp:eventum eventum && cd eventum && make dist
 Source0:       %{name}-%{version}-dev-%{rev}.tar.gz
-# Source0-md5: 906d09b73296888f5ce383ea0c7a045c
+# Source0-md5: 732712a61a2761898c32db5d08b87f01
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
 Source3:       %{name}-mail-download.cron