gunnar: server/kolab-webclient/imp imp.spec,1.3,1.4

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/imp
In directory doto:/tmp/cvs-serv11087

Modified Files:
	imp.spec 
Log Message:
Add configuration for alternate login method. Fix template destinations.

Index: imp.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/imp/imp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- imp.spec	21 Jan 2010 22:24:24 -0000	1.3
+++ imp.spec	21 Jan 2010 23:11:31 -0000	1.4
@@ -29,6 +29,7 @@
 Source11:       10-kolab_hooks_base.php
 Source12:       10-kolab_servers_base.php
 Source13:       conf.php
+Source14:       11-kolab_conf_imp.php
 
 # List of Patches
 Patch0:         package.patch
@@ -64,6 +65,7 @@
 %install
 
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp
+	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/conf.d
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
@@ -104,6 +106,7 @@
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:11} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/hooks.d/
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:12} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/servers.d/
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:13} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/
+	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:14} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/conf.d/
 
 	sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/imp/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template
 
@@ -117,6 +120,8 @@
             '%config %{l_prefix}/etc/kolab/templates/webclient-imp_prefs.php.template' \
             '%config %{l_prefix}/etc/kolab/templates/webclient-imp_servers.php.template' \
             '%config %{l_prefix}/etc/kolab/templates/webclient-imp_spelling.php.template' \
+            '%config(noreplace) %defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/webclient_data/storage/imp.db' \
+            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/storage \
 	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/imp/config/conf.php
 
 %clean