stephan: server/horde Makefile, 1.4, 1.5 horde.spec, 1.6, 1.7 horde_registry.php, 1.3, 1.4 imp_servers.php, 1.3, 1.4 kronolith_conf.php, 1.1, 1.2 nag_conf.php, 1.1, 1.2

Fri Aug 29 14:45:12 CEST 2003

Author: stephan

Update of /kolabrepository/server/horde
In directory doto:/tmp/cvs-serv10631

Modified Files:
	Makefile horde.spec horde_registry.php imp_servers.php 
	kronolith_conf.php nag_conf.php 
Log Message:
Kolab Webclient update. Notes, Contacts, Tasks and Calendar is now supported.
This can be considered a Alpha release.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5

--- Makefile	22 Aug 2003 13:29:55 -0000	1.4
+++ Makefile	29 Aug 2003 12:45:10 -0000	1.5
@@ -5,7 +5,7 @@
 all:
        #test -d $(KOLABRPMSRC)/kolab && mkdir $(KOLABRPMSRC)/kolab
 	test -d $(KOLABRPMSRC)/horde || mkdir $(KOLABRPMSRC)/horde
-	#cp Makefile horde-2.2.3.tar.gz pear-1.0.1.1.tar.gz imp-3.2.1.tar.gz \
+	cp Makefile horde-2.2.3.tar.gz pear-1.1.tar.gz imp-3.2.1.tar.gz \
 	turba-1.2.tar.gz kronolith-1.1.tar.gz mnemo-1.1.tar.gz nag-1.1.tar.gz \
 	horde.spec $(KOLABRPMSRC)/horde/
 	cp Makefile horde.spec $(KOLABRPMSRC)/horde/

Index: horde.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- horde.spec	22 Aug 2003 13:29:55 -0000	1.6
+++ horde.spec	29 Aug 2003 12:45:10 -0000	1.7
@@ -26,9 +26,9 @@
 %define       V_pear          1.1
 %define       V_imp           3.2.1
 %define       V_turba         1.2
-#%define       V_kronolith     1.1
+%define       V_kronolith     1.1
 %define       V_mnemo         1.1
-#%define       V_nag           1.1
+%define       V_nag           1.1
 
 #   package information
 Name:         horde
@@ -40,7 +40,7 @@
 Group:        core
 License:      LGPL
 Version:      %{V_horde}
-Release:      20030605
+Release:      20030829
 
 #   package options
 #%option       with_beta  yes
@@ -50,9 +50,9 @@
 Source1:      ftp://ftp.horde.org/pub/pear/pear-%{V_pear}.tar.gz
 Source2:      ftp://ftp.horde.org/pub/imp/imp-%{V_imp}.tar.gz
 Source3:      ftp://ftp.horde.org/pub/turba/turba-%{V_turba}.tar.gz
-#Source4:      ftp://ftp.horde.org/pub/kronolith/kronolith-%{V_kronolith}.tar.gz
+Source4:      ftp://ftp.horde.org/pub/kronolith/kronolith-%{V_kronolith}.tar.gz
 Source5:      ftp://ftp.horde.org/pub/mnemo/mnemo-%{V_mnemo}.tar.gz
-#Source6:      ftp://ftp.horde.org/pub/nag/nag-%{V_nag}.tar.gz
+Source6:      ftp://ftp.horde.org/pub/nag/nag-%{V_nag}.tar.gz
 Source7:      horde_horde.php
 Source8:      horde_html.php
 Source9:      horde_mime_drivers.php
@@ -78,6 +78,17 @@
 Source29:     nag_prefs.php
 Source30:     nag_html.php
 Source31:     turba_kolab.php
+Source32:     Kolab.php
+Source33:     iCalendar.php
+Source34:     valarm.php
+Source35:     vevent.php
+Source36:     vfreebusy.php
+Source37:     vjournal.php
+Source38:     vtimezone.php
+Source39:     vtodo.php
+Source40:     nag_kolab.php
+Source41:     kronolith_kolab.php
+Source41:     String.php
 
 #   build information
 Prefix:       %{l_prefix}
@@ -96,9 +107,9 @@
     %setup1  -q -T -D -a 1
     %setup2  -q -T -D -a 2
     %setup3  -q -T -D -a 3
-#    %setup4  -q -T -D -a 4
+    %setup4  -q -T -D -a 4
     %setup5  -q -T -D -a 5
-#    %setup6  -q -T -D -a 6
+    %setup6  -q -T -D -a 6
 
 %build
     #Done
@@ -107,6 +118,7 @@
     rm -rf $RPM_BUILD_ROOT
     
     %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/
+    %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/lib/iCalendar
     %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/lib/php
     %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/openldap/schema/
    
@@ -117,12 +129,12 @@
       cp -r imp/ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
       %{l_shtool} move turba-%{V_turba} turba
       cp -r turba/ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
-#      %{l_shtool} move kronolith-%{V_kronolith} kronolith
-#      cp -r kronolith/ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
+      %{l_shtool} move kronolith-%{V_kronolith} kronolith
+      cp -r kronolith/ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
       %{l_shtool} move mnemo-%{V_mnemo} mnemo
       cp -r mnemo/ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
-#       %{l_shtool} move nag-%{V_nag} nag
-#      cp -r nag/ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
+       %{l_shtool} move nag-%{V_nag} nag
+      cp -r nag/ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
    )
     
     #For Turba LDAP integration
@@ -148,18 +160,30 @@
     %{l_shtool} install -c -m 755 %{SOURCE turba_attributes.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/turba/config/attributes.php
     %{l_shtool} install -c -m 755 %{SOURCE turba_kolab.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/turba/lib/Driver/kolab.php
       # Handle Kronolith configuration files
-#    %{l_shtool} install -c -m 755 %{SOURCE kronolith_conf.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/kronolith/config/conf.php
-#    %{l_shtool} install -c -m 755 %{SOURCE kronolith_html.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/kronolith/config/html.php
-#    %{l_shtool} install -c -m 755 %{SOURCE kronolith_prefs.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/kronolith/config/prefs.php
+    %{l_shtool} install -c -m 755 %{SOURCE kronolith_conf.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/kronolith/config/conf.php
+    %{l_shtool} install -c -m 755 %{SOURCE kronolith_html.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/kronolith/config/html.php
+    %{l_shtool} install -c -m 755 %{SOURCE kronolith_prefs.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/kronolith/config/prefs.php
+    %{l_shtool} install -c -m 755 %{SOURCE kronolith_kolab.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/kronolith/lib/Driver/kolab.php
        # Handle Mnemo configuration files
     %{l_shtool} install -c -m 755 %{SOURCE mnemo_conf.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/mnemo/config/conf.php
     %{l_shtool} install -c -m 755 %{SOURCE mnemo_prefs.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/mnemo/config/prefs.php
     %{l_shtool} install -c -m 755 %{SOURCE mnemo_kolab.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/mnemo/lib/Driver/kolab.php
         # Handle Nag configuration files
-#    %{l_shtool} install -c -m 755 %{SOURCE nag_conf.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/nag/config/conf.php
-#    %{l_shtool} install -c -m 755 %{SOURCE nag_prefs.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/nag/config/prefs.php
-#    %{l_shtool} install -c -m 755 %{SOURCE nag_html.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/nag/config/html.php
-   
+    %{l_shtool} install -c -m 755 %{SOURCE nag_conf.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/nag/config/conf.php
+    %{l_shtool} install -c -m 755 %{SOURCE nag_prefs.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/nag/config/prefs.php
+    %{l_shtool} install -c -m 755 %{SOURCE nag_html.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/nag/config/html.php
+    %{l_shtool} install -c -m 755 %{SOURCE nag_kolab.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/nag/lib/Driver/kolab.php
+    # Handle the extra Horde libraries; Kolab & iCalendar
+    %{l_shtool} install -c -m 755 %{SOURCE Kolab.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/lib/Kolab.php
+    %{l_shtool} install -c -m 755 %{SOURCE iCalendar.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/lib/iCalendar.php
+    %{l_shtool} install -c -m 755 %{SOURCE valarm.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/lib/iCalendar/valarm.php
+    %{l_shtool} install -c -m 755 %{SOURCE vevent.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/lib/iCalendar/vevent.php
+    %{l_shtool} install -c -m 755 %{SOURCE vfreebusy.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/lib/iCalendar/vfreebusy.php
+    %{l_shtool} install -c -m 755 %{SOURCE vjournal.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/lib/iCalendar/vjournal.php
+    %{l_shtool} install -c -m 755 %{SOURCE vtimezone.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/lib/iCalendar/vtimezone.php
+    %{l_shtool} install -c -m 755 %{SOURCE vtodo.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/lib/iCalendar/vtodo.php
+    %{l_shtool} install -c -m 755 %{SOURCE String.php} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/lib/String.php
+
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 
 %post

Index: horde_registry.php
===================================================================
RCS file: /kolabrepository/server/horde/horde_registry.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- horde_registry.php	22 Aug 2003 13:29:55 -0000	1.3
+++ horde_registry.php	29 Aug 2003 12:45:10 -0000	1.4
@@ -131,7 +131,7 @@
     'icon' => $this->applications['horde']['webroot'] . '/kronolith/graphics/kronolith.gif',
     'name' => _("Calendar"),
     'allow_guests' => false,
-    'status' => 'inactive'
+    'status' => 'active'
 );
 
 $this->applications['mnemo'] = array(
@@ -149,7 +149,7 @@
     'icon' => $this->applications['horde']['webroot'] . '/nag/graphics/nag.gif',
     'name' => _("Tasks"),
     'allow_guests' => false,
-    'status' => 'inactive'
+    'status' => 'active'
 );
 
 $this->applications['chora'] = array(

Index: imp_servers.php
===================================================================
RCS file: /kolabrepository/server/horde/imp_servers.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- imp_servers.php	31 Jul 2003 20:01:18 -0000	1.3
+++ imp_servers.php	29 Aug 2003 12:45:10 -0000	1.4
@@ -92,8 +92,8 @@
     'port' => 143,
     'folders' => '',
     'namespace' => 'INBOX.',
-    'maildomain' => 'kolabtest.co.za',
-    'realm' => 'kolabtest.co.za',
+    'maildomain' => '',
+    'realm' => '',
     'preferred' => ''
 );
 

Index: kronolith_conf.php
===================================================================
RCS file: /kolabrepository/server/horde/kronolith_conf.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kronolith_conf.php	7 Jun 2003 06:53:25 -0000	1.1
+++ kronolith_conf.php	29 Aug 2003 12:45:10 -0000	1.2
@@ -19,18 +19,20 @@
 
 // What calendar backend is being used? Right now, the only options are
 // 'mcal' and 'sql', but others may appear at some point in the future.
-$conf['calendar']['driver'] = 'mcal';
+$conf['calendar']['driver'] = 'kolab';
 
 // What MCAL driver is being used? 'mstore' is the local file driver,
 // and is the only one with extensive testing. There is also an ICAP
 // driver, and theoretically an ICAP server, but Kronolith has not
 // been tested with them.
-$conf['calendar']['params']['driver'] = 'mstore';
+$conf['calendar']['params']['folder'] = 'INBOX/Calendar';
+$conf['calendar']['params']['server'] = 'localhost';
+// $conf['calendar']['params']['driver'] = 'mstore';
 
-// The mstore driver requires a username and a password that is in 
+// The mstore driver requires a username and a password that is in
 // /etc/mpasswd in order to access local calendars.
-$conf['calendar']['params']['username'] = '';
-$conf['calendar']['params']['password'] = '';
+// $conf['calendar']['params']['username'] = '';
+// $conf['calendar']['params']['password'] = '';
 
 // This is an example configuration for an sql driver, in this case MySQL.
 // $conf['calendar']['params']['phptype'] = 'mysql';

Index: nag_conf.php
===================================================================
RCS file: /kolabrepository/server/horde/nag_conf.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nag_conf.php	7 Jun 2003 06:53:25 -0000	1.1
+++ nag_conf.php	29 Aug 2003 12:45:10 -0000	1.2
@@ -35,13 +35,16 @@
  **/
 
 // What storage driver should we use?  Valid values are 'sql'.
-$conf['storage']['driver'] = 'sql';
+$conf['storage']['driver'] = 'kolab';
 
 // Any parameters that the storage driver needs. This includes
 // database or ldap server, username/password to connect with, etc.
 // Below is an example configuration for an sql driver, in this case
 // MySQL.
 $conf['storage']['params'] = array();
+$conf['storage']['params']['folder'] = 'INBOX/Tasks';
+$conf['storage']['params']['server'] = 'localhost';
+
 // $conf['storage']['params']['phptype'] = 'mysql';
 // $conf['storage']['params']['hostspec'] = 'localhost';
 // $conf['storage']['params']['username'] = 'horde';



