gunnar: server/horde/horde ChangeLog, 1.4, 1.5 conf.php, 1.9, 1.10 horde-kolab.spec, 1.21, 1.22

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	ChangeLog conf.php horde-kolab.spec 
Log Message:
Horde packages updated to the newest RC1 release.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog	19 Nov 2007 19:35:44 -0000	1.4
+++ ChangeLog	29 Nov 2007 08:25:52 -0000	1.5
@@ -1,3 +1,7 @@
+2007-11-29  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-kolab.spec: Update to RC1
+
 2007-11-19  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-kolab.spec:

Index: conf.php
===================================================================
RCS file: /kolabrepository/server/horde/horde/conf.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- conf.php	7 Nov 2007 10:37:53 -0000	1.9
+++ conf.php	29 Nov 2007 08:25:52 -0000	1.10
@@ -1,6 +1,6 @@
 <?php
 /* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
-// $Horde: horde/config/conf.xml,v 1.194 2007/07/30 15:47:32 chuck Exp $
+// $Horde: horde/config/conf.xml,v 1.206 2007/11/19 14:33:17 jan Exp $
 $conf['vhosts'] = false;
 $conf['debug_level'] = E_ALL;
 $conf['max_exec_time'] = 0;
@@ -16,7 +16,7 @@
 $conf['session']['timeout'] = 3600;
 $conf['cookie']['domain'] = $_SERVER['SERVER_NAME'];
 $conf['cookie']['path'] = '/horde';
-$conf['sql'] = NULL;
+$conf['sql'] = null;
 $conf['auth']['admins'] = array('manager');
 $conf['auth']['checkip'] = true;
 $conf['auth']['checkbrowser'] = true;
@@ -46,10 +46,9 @@
 $conf['cache']['default_lifetime'] = 1800;
 $conf['cache']['params']['dir'] = Horde::getTempDir();
 $conf['cache']['params']['sub'] = 0;
-$conf['cache']['params']['gc'] = 86400;
 $conf['cache']['driver'] = 'file';
 $conf['token']['driver'] = 'none';
-$conf['mailer']['params']['auth'] = '0';
+$conf['mailer']['params']['auth'] = false;
 $conf['mailer']['type'] = 'smtp';
 $conf['mailformat']['brokenrfc2231'] = false;
 $conf['tmpdir'] = dirname(__FILE__) . '/../../../tmp/horde';
@@ -87,8 +86,8 @@
 $conf['kolab']['imap']['server'] = 'localhost';
 $conf['kolab']['imap']['port'] = 143;
 $conf['kolab']['imap']['sieveport'] = 2000;
-$conf['kolab']['imap']['virtdomains'] = true;
 $conf['kolab']['imap']['maildomain'] = 'example.com';
+$conf['kolab']['imap']['virtdomains'] = true;
 $conf['kolab']['smtp']['server'] = 'localhost';
 $conf['kolab']['smtp']['port'] = 25;
 $conf['kolab']['misc']['multidomain'] = false;

Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- horde-kolab.spec	19 Nov 2007 19:35:44 -0000	1.21
+++ horde-kolab.spec	29 Nov 2007 08:25:52 -0000	1.22
@@ -3,9 +3,9 @@
 %define         V_package %{V_horde_name}-kolab
 %define         V_year  2007
 %define         V_month 11
-%define         V_day   19
-%define         V_version 3.2_alpha
-%define         V_uver    3.2-alpha
+%define         V_day   28
+%define         V_version 3.2_rc1
+%define         V_uver    3.2-rc1
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
 
@@ -24,12 +24,7 @@
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-%{V_uver}.tar.gz
 Source1:        horde-kolab-conf.template
-Source2:        hooks.php
-Source3:        conf.php
-Source4:        registry.php
-
-# List of Patches
-Patch0:         HK-GW-Deleting_categories.patch
+Source2:        conf.php
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -68,7 +63,6 @@
 	%setup -c -q -n %{V_horde_name}-%{V_uver}
 
 	cd %{V_horde_name}-%{V_uver}
-	%patch -p2 -P 0
 	cd ..
 
 %build
@@ -93,17 +87,15 @@
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
-	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:2} %{S:3} %{S:4}   \
+	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:2}   \
 	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/config/
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache/log/horde \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/tmp/horde \
-	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/horde-kolab-conf.template'\
+	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/horde-kolab-conf.template' \
 	    '%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/horde/config/conf.php'    \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/horde/config/conf.php'    \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/horde/config/hooks.php'   \
-	    '%config(noreplace) %{l_prefix}/var/kolab/www/horde/config/registry.php'
+	    '%config(noreplace) %{l_prefix}/var/kolab/www/horde/config/conf.php'
 
 %clean
 	rm -rf $RPM_BUILD_ROOT