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

cvs at kolab.org cvs at kolab.org
Fri Jan 22 22:43:41 CET 2010


Author: gunnar

Update of /kolabrepository/server/kolab-webclient/turba
In directory doto:/tmp/cvs-serv21262/kolab-webclient/turba

Modified Files:
	turba.spec 
Log Message:
Add turba.

Index: turba.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/turba/turba.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- turba.spec	19 Jan 2010 13:17:11 -0000	1.1
+++ turba.spec	22 Jan 2010 21:43:39 -0000	1.2
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package turba
 %define         V_version 2.3.3
-%define         V_release 20100119
+%define         V_release 20100122
 
 # Package Information
 Name:		%{V_package}
@@ -25,6 +25,7 @@
 Source7:        webclient-turba_sources.php.template
 Source8:        10-kolab_conf_base.php
 Source9:        10-kolab_conf_base.php
+Source10:       conf.php
 
 # List of Patches
 Patch0:         package.patch
@@ -36,7 +37,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-Net_LDAP
 
 AutoReq:      no
@@ -102,6 +103,7 @@
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:8} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/turba/config/conf.d/
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:9} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/turba/config/sources.d/
+	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:10} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/turba/config/
 
 	sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/turba/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template
 
@@ -113,7 +115,7 @@
             '%config %{l_prefix}/etc/kolab/templates/webclient-turba_mime_drivers.php.template' \
             '%config %{l_prefix}/etc/kolab/templates/webclient-turba_prefs.php.template' \
             '%config %{l_prefix}/etc/kolab/templates/webclient-turba_sources.php.template' \
-#	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/turba/config/conf.php
+	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/turba/config/conf.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT





More information about the commits mailing list