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

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/dimp
In directory doto:/tmp/cvs-serv31824

Modified Files:
	dimp.spec 
Log Message:
Complete the dimp package. The patches still need to be merged.

Index: dimp.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/dimp/dimp.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dimp.spec	18 Jan 2010 20:33:56 -0000	1.1
+++ dimp.spec	22 Jan 2010 09:29:15 -0000	1.2
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package dimp
 %define         V_version 1.1.4
-%define         V_release 20100118
+%define         V_release 20100122
 
 # Package Information
 Name:		%{V_package}
@@ -23,6 +23,7 @@
 Source5:        webclient-dimp_prefs.php.template
 Source6:        webclient-dimp_servers.php.template
 Source7:        10-kolab_servers_base.php
+Source8:        conf.php
 
 # List of Patches
 Patch0:         package.patch
@@ -34,8 +35,7 @@
 #Pre requisites
 BuildPreReq:  OpenPKG, openpkg >= 20070603
 BuildPreReq:  php, php::with_pear = yes
-PreReq:       horde-3.3.6
-PreReq:       imp-4.3.6
+PreReq:       imp >= 4.3.6
 
 AutoReq:      no
 AutoReqProv:  no
@@ -85,6 +85,7 @@
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:7} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp/config/servers.d/
+	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:8} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/dimp/config/
 
 	sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/dimp/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template
 
@@ -95,7 +96,7 @@
             '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_portal.php.template' \
             '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_prefs.php.template' \
             '%config %{l_prefix}/etc/kolab/templates/webclient-dimp_servers.php.template' \
-#	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/dimp/config/conf.php
+	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/dimp/config/conf.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT