- updated to 1.2RC6

Changed files:
    egroupware-setup.patch -> 1.2
    egroupware-ttfdir.patch -> 1.2

diff --git a/egroupware-setup.patch b/egroupware-setup.patch
index 6c02c0a13a7feff56a6c18c60ee8ef62c70c12cf..16dc2893eb8983d6f0a5c6e553aa19b6ae275dac 100644 (file)
--- a/egroupware-setup.patch
+++ b/egroupware-setup.patch
@@ -28,13 +28,13 @@
  
                                while(list($k,$v) = each($supported_db))
 --- ./setup/index.php  2004-11-17 14:48:22.000000000 +0200
-+++ /tmp/index.php     2005-09-11 16:07:11.000000000 +0300
-@@ -177,7 +177,7 @@
++++ /home/builder/rpm/BUILD/egroupware/setup/index.php 2006-02-05 19:31:35.000000000 +0200
+@@ -201,7 +201,7 @@
                                        $setup_tpl->set_var('instr',
-                                               lang("Instructions for creating the database in %1:",'MySql')
-                                               . '<br>'.lang('Login to mysql -')
--                                              . '<br><i>[user@server user]# mysql -u root -p</i><br>'
-+                                              . '<br><i>[user@server user]# mysql -u mysql -p</i><br>'
+                                               '<b>'.lang("Instructions for creating the database in %1:",'MySql').'</b>'
+                                               . '<br />'.lang('Login to mysql -')
+-                                              . '<br /><i>[user@server user]# <b>mysql -u root -p</b></i><br />'
++                                              . '<br /><i>[user@server user]# <b>mysql -u mysql -p</b></i><br />'
                                                . lang('Create the empty database and grant user permissions -')
-                                               . "<br><i>mysql> create database $info[db_name];</i>"
-                                               . "<br><i>mysql> grant all on " . $info['db_name']
+                                               . "<br /><i>mysql> <b>CREATE DATABASE $info[db_name]$set_charset;</b></i>"
+                                               . "<br /><i>mysql> <b>GRANT ALL ON " . $info['db_name']

diff --git a/egroupware-ttfdir.patch b/egroupware-ttfdir.patch
index 8b92c22b51dec86e6f3b873f79ba361dad7f82e3..529d0bef35f9fdbea85c3a39ce7d61de2a9708e0 100644 (file)
--- a/egroupware-ttfdir.patch
+++ b/egroupware-ttfdir.patch
@@ -1,21 +1,22 @@
---- ./projects/inc/class.bostatistics.inc.php  2004-11-06 14:15:28.000000000 +0200
-+++ /tmp/class.bostatistics.inc.php    2005-09-11 16:21:20.000000000 +0300
-@@ -142,7 +142,7 @@
-                       if(!function_exists('imagecopyresampled')) 
-                               return false;
-                       
--                      DEFINE("TTF_DIR",PHPGW_SERVER_ROOT."/projects/ttf-bitstream-vera-1.10/");
-+                      DEFINE("TTF_DIR","/usr/share/fonts/TTF/");
-                       if(file_exists(PHPGW_SERVER_ROOT . '/../jpgraph/src/jpgraph.php'))
-                       {
-                               include(PHPGW_SERVER_ROOT . '/../jpgraph/src/jpgraph.php');
---- ./projects/inc/jpgraph-1.5.2/src/jpgraph_dir.php   2004-06-01 13:38:37.000000000 +0300
-+++ /tmp/jpgraph_dir.php       2005-09-11 16:21:20.000000000 +0300
-@@ -26,6 +26,6 @@
+--- egroupware/projectmanager/inc/class.ganttchart.inc.php~    2006-02-05 17:49:46.000000000 +0200
++++ egroupware/projectmanager/inc/class.ganttchart.inc.php     2006-02-05 19:34:02.000000000 +0200
+@@ -14,7 +14,7 @@
+ 
+ include_once(EGW_INCLUDE_ROOT.'/projectmanager/inc/class.boprojectelements.inc.php');
+ 
+-define('TTF_DIR',EGW_SERVER_ROOT.'/projectmanager/inc/ttf-bitstream-vera-1.10/');
++define('TTF_DIR', '/usr/share/fonts/TTF/');
+ if(file_exists(EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph.php'))
+ {
+       include(EGW_SERVER_ROOT . '/../jpgraph/src/jpgraph.php');
+--- egroupware/projectmanager/inc/jpgraph-1.5.2/src/jpgraph_dir.php~   2006-02-05 17:49:46.000000000 +0200
++++ egroupware/projectmanager/inc/jpgraph-1.5.2/src/jpgraph_dir.php    2006-02-05 19:34:55.000000000 +0200
+@@ -25,7 +25,6 @@
+ DEFINE("APACHE_CACHE_DIR","/jpgraph_cache/");
  
  // Directory for TTF fonts. Must end with '/'
- #DEFINE("TTF_DIR","/usr/local/fonts/ttf/");
+-#DEFINE("TTF_DIR","/usr/local/fonts/ttf/");
 -DEFINE("TTF_DIR",PHPGW_SERVER_ROOT."/projects/ttf-bitstream-vera-1.10/");
-+DEFINE("TTF_DIR","/usr/share/fonts/TTF/");
++define('TTF_DIR', '/usr/share/fonts/TTF/');
  
  ?>