gunnar: server/kolab-webclient/imp imp.spec,1.4,1.5

cvs at kolab.org cvs at kolab.org
Fri Jan 22 08:50:10 CET 2010


Author: gunnar

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

Modified Files:
	imp.spec 
Log Message:
Extract the part of the patch that has not yet been commited to CVS.

Index: imp.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/imp/imp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imp.spec	21 Jan 2010 23:11:31 -0000	1.4
+++ imp.spec	22 Jan 2010 07:50:08 -0000	1.5
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package imp
 %define         V_version 4.3.6
-%define         V_release 20100121
+%define         V_release 20100122
 
 # Package Information
 Name:		%{V_package}
@@ -26,10 +26,9 @@
 Source8:        webclient-imp_servers.php.template
 Source9:        webclient-imp_spelling.php.template
 Source10:       10-kolab_conf_base.php
-Source11:       10-kolab_hooks_base.php
-Source12:       10-kolab_servers_base.php
-Source13:       conf.php
-Source14:       11-kolab_conf_imp.php
+Source11:       10-kolab_servers_base.php
+Source12:       conf.php
+Source13:       11-kolab_conf_imp.php
 
 # List of Patches
 Patch0:         package.patch
@@ -103,10 +102,9 @@
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
 
 	%{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/
-	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:14} $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/imp/config/servers.d/
+	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:12} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/imp/config/
+	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:13} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/config/conf.d/
 
 	sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/imp/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template
 





More information about the commits mailing list