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

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/passwd
In directory doto:/tmp/cvs-serv30958

Modified Files:
	passwd.spec 
Log Message:
Complete the passwd package.

Index: passwd.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/passwd/passwd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- passwd.spec	19 Jan 2010 13:20:45 -0000	1.1
+++ passwd.spec	22 Jan 2010 09:00:11 -0000	1.2
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package passwd
 %define         V_version 3.1.2
-%define         V_release 20100119
+%define         V_release 20100122
 
 # Package Information
 Name:		%{V_package}
@@ -19,6 +19,7 @@
 Source1:        webclient-passwd_conf.php.template
 Source2:        webclient-passwd_backends.php.template
 Source3:        10-kolab_backends_base.php
+Source4:        conf.php
 
 # List of Patches
 Patch0:         package.patch
@@ -30,7 +31,7 @@
 #Pre requisites
 BuildPreReq:  OpenPKG, openpkg >= 20070603
 BuildPreReq:  php, php::with_pear = yes
-PreReq:       horde-3.3.6
+PreReq:       horde >= 3.3.6
 
 AutoReq:      no
 AutoReqProv:  no
@@ -79,13 +80,14 @@
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:3} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/passwd/config/backends.d/
+	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:4} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/passwd/config/
 
 	sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/passwd/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
             '%config %{l_prefix}/etc/kolab/templates/webclient-passwd_conf.php.template' \
             '%config %{l_prefix}/etc/kolab/templates/webclient-passwd_backends.php.template' \
-#	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/passwd/config/conf.php
+	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/passwd/config/conf.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT