gunnar: server/kolab-webclient/horde horde.spec,1.8,1.9

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/horde
In directory doto:/tmp/cvs-serv9751

Modified Files:
	horde.spec 
Log Message:
Add missing dependency and old configuration file.

Index: horde.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/horde.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- horde.spec	21 Jan 2010 19:57:42 -0000	1.8
+++ horde.spec	21 Jan 2010 22:25:04 -0000	1.9
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package horde
 %define         V_version 3.3.6
-%define         V_release 20100111
+%define         V_release 20100121
 
 # Package Information
 Name:		%{V_package}
@@ -26,6 +26,7 @@
 Source8:        10-kolab_hooks_base.php
 Source9:        10-kolab_prefs_base.php
 Source10:       10-kolab_conf_base.php
+Source11:       conf.php
 
 # List of Patches
 Patch0:         package.patch
@@ -50,6 +51,7 @@
 PreReq:       Horde_Http_Client
 PreReq:       Horde_Image
 PreReq:       Horde_Loader
+PreReq:       Horde_Kolab
 PreReq:       Horde_Maintenance
 PreReq:       Horde_Mobile
 PreReq:       Horde_Net_SMS
@@ -162,6 +164,7 @@
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:8} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/hooks.d/
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:9} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/prefs.d/
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:10} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/conf.d/
+	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:11} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/
 
 	sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template
 
@@ -173,6 +176,7 @@
             '%config %{l_prefix}/etc/kolab/templates/webclient-config_nls.php.template' \
             '%config %{l_prefix}/etc/kolab/templates/webclient-config_prefs.php.template' \
             '%config %{l_prefix}/etc/kolab/templates/webclient-config_registry.php.template' \
+            '%config(noreplace) %{l_prefix}/var/kolab/webclient_data/storage/horde.db \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/log \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/storage \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/webclient_data/storage/horde.db \