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

cvs at kolab.org cvs at kolab.org
Thu Jan 21 23:24:26 CET 2010


Author: gunnar

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

Modified Files:
	imp.spec 
Log Message:
Add configuration file, add imp log table and add missing dependency.

Index: imp.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/imp/imp.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- imp.spec	21 Jan 2010 21:23:40 -0000	1.2
+++ imp.spec	21 Jan 2010 22:24:24 -0000	1.3
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package imp
 %define         V_version 4.3.6
-%define         V_release 20100118
+%define         V_release 20100121
 
 # Package Information
 Name:		%{V_package}
@@ -28,6 +28,7 @@
 Source10:       10-kolab_conf_base.php
 Source11:       10-kolab_hooks_base.php
 Source12:       10-kolab_servers_base.php
+Source13:       conf.php
 
 # List of Patches
 Patch0:         package.patch
@@ -42,6 +43,7 @@
 PreReq:       horde >= 3.3.6
 PreReq:       PEAR-Auth_SASL >= 1.0.2
 PreReq:       PEAR-Mail
+PreReq:       Horde_IMAP
 
 AutoReq:      no
 AutoReqProv:  no
@@ -62,6 +64,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/webclient_data/storage
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
 	cd %{V_package}-h3-%{V_version}
@@ -80,6 +83,8 @@
 
 	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp
 
+        sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/webclient_data/storage/imp.db < scripts/sql/imp.sql
+
 	cd ..
 
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/conf.d
@@ -98,6 +103,7 @@
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:10} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/conf.d/
 	%{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/
 
 	sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/imp/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template
 
@@ -111,7 +117,7 @@
             '%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' \
-#	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/imp/config/conf.php
+	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/imp/config/conf.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT





More information about the commits mailing list