gunnar: server/kolab-webclient/kronolith kronolith.spec,1.1,1.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/kronolith
In directory doto:/tmp/cvs-serv10728

Modified Files:
	kronolith.spec 
Log Message:
Prepare installable version of kronolith. Kolab patches still need to be merged.

Index: kronolith.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kronolith/kronolith.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kronolith.spec	19 Jan 2010 06:59:59 -0000	1.1
+++ kronolith.spec	22 Jan 2010 16:02:06 -0000	1.2
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package kronolith
 %define         V_version 2.3.3
-%define         V_release 20100119
+%define         V_release 20100122
 
 # Package Information
 Name:		%{V_package}
@@ -21,6 +21,7 @@
 Source3:        webclient-kronolith_menu.php.template
 Source4:        webclient-kronolith_prefs.php.template
 Source5:        10-kolab_conf_base.php
+Source6:        conf.php
 
 # List of Patches
 Patch0:         package.patch
@@ -32,7 +33,7 @@
 #Pre requisites
 BuildPreReq:  OpenPKG, openpkg >= 20070603
 BuildPreReq:  php, php::with_pear = yes
-PreReq:       horde-3.3.6
+PreReq:       horde >= 3.3.6
 PreReq:       PEAR-Date_Holidays_Austria >= 0.1.3
 PreReq:       PEAR-Date_Holidays_Brazil >= 0.1.2
 PreReq:       PEAR-Date_Holidays_Denmark >= 0.1.3
@@ -102,6 +103,7 @@
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:5} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/kronolith/config/conf.d/
+	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:6} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/kronolith/config/
 
 	sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/kronolith/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template
 
@@ -110,7 +112,7 @@
             '%config %{l_prefix}/etc/kolab/templates/webclient-kronolith_keywords.php.template' \
             '%config %{l_prefix}/etc/kolab/templates/webclient-kronolith_menu.php.template' \
             '%config %{l_prefix}/etc/kolab/templates/webclient-kronolith_prefs.php.template' \
-#	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/kronolith/config/conf.php
+	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/kronolith/config/conf.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT