gunnar: server/horde/horde Makefile, 1.12, 1.13 conf.php, 1.2, 1.3 horde-kolab-conf.template, 1.1, 1.2 horde-kolab.spec, 1.5, 1.6

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	Makefile conf.php horde-kolab-conf.template horde-kolab.spec 
Log Message:
Prepared the horde packages for a first test installation.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile	2 Aug 2007 07:57:13 -0000	1.12
+++ Makefile	3 Aug 2007 07:38:08 -0000	1.13
@@ -19,8 +19,8 @@
 DATE = ${YEAR}-${MONTH}-${DAY}
 
 PACKAGE = $(HORDE_NAME)-kolab
-VERSION = ${YEAR}${MONTH}${DAY}
-RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = ${YEAR}${MONTH}${DAY}
 
 PATCHES = $(shell find . -name "*.patch")
 TEMPLATES = $(shell find . -name "*.template")

Index: conf.php
===================================================================
RCS file: /kolabrepository/server/horde/horde/conf.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- conf.php	25 May 2007 10:52:24 -0000	1.2
+++ conf.php	3 Aug 2007 07:38:08 -0000	1.3
@@ -29,7 +29,7 @@
 $conf['log']['priority'] = PEAR_LOG_NOTICE;
 $conf['log']['ident'] = 'HORDE';
 $conf['log']['params'] = array();
-$conf['log']['name'] = '/tmp/horde.log';
+$conf['log']['name'] = '/kolab/var/apache2/log/fbview/fbview.log';
 $conf['log']['params']['append'] = true;
 $conf['log']['type'] = 'file';
 $conf['log']['enabled'] = true;

Index: horde-kolab-conf.template
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab-conf.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-kolab-conf.template	25 May 2007 10:21:44 -0000	1.1
+++ horde-kolab-conf.template	3 Aug 2007 07:38:08 -0000	1.2
@@ -4,12 +4,10 @@
 OWNERSHIP=kolab-n:kolab-n
 KOLAB_META_END
 <?php
-$conf['cookie']['domain'] = @@@fqdnhostname@@@;
+$conf['cookie']['domain'] = '@@@fqdnhostname@@@';
 $conf['problems']['email'] = 'postmaster@@@@postfix-mydomain@@@';
 $conf['problems']['maildomain'] = '@@@postfix-mydomain@@@';
 $conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
-$conf['kolab']['ldap']['binddn'] = 'cn=manager,cn=internal,@@@base_dn@@@';
-$conf['kolab']['ldap']['bindpw'] = '@@@bind_pw@@@';
 $conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
 $conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
 $conf['kolab']['imap']['server'] = '@@@fqdnhostname@@@';

Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- horde-kolab.spec	23 Jul 2007 16:06:42 -0000	1.5
+++ horde-kolab.spec	3 Aug 2007 07:38:08 -0000	1.6
@@ -2,11 +2,11 @@
 %define         V_horde_name horde
 %define         V_package %{V_horde_name}-kolab
 %define         V_year  2007
-%define         V_month 07
-%define         V_day   23
-%define		V_version %{V_year}%{V_month}%{V_day}
-%define		V_date %{V_year}-%{V_month}-%{V_day}
-%define         V_release 1
+%define         V_month 08
+%define         V_day   03
+%define         V_version 3.1.4.99
+%define         V_date %{V_year}-%{V_month}-%{V_day}
+%define         V_release %{V_year}%{V_month}%{V_day}
 
 # Package Information
 Name:		%{V_package}
@@ -37,7 +37,8 @@
 PreReq:       php, php::with_pear = yes
 PreReq:	      PEAR-Mail_Mime >= 1.3.1
 PreReq:	      PEAR-Mail >= 1.1.14
-PreReq:	      horde-framework-kolab >= %{V_version}
+PreReq:	      PEAR-Log >= 1.9.9
+PreReq:	      horde-framework-kolab >= 3.1.4.99
 
 AutoReq:      no
 AutoReqProv:  no
@@ -71,6 +72,7 @@
 	  $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/apache2/log/horde \
 	    '%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'    \