[evolution-patches] patch for bug 305633

["Susarla Parthasarathi" <sparthasarathi novell com>]

Hi,
The attached patch solves the issue of the version mis-match.

The bug -> http://bugzilla.gnome.org/show_bug.cgi?id=305633

Cheers,
partha

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/ChangeLog,v
retrieving revision 1.301
diff -u -p -r1.301 ChangeLog
--- ChangeLog	29 Aug 2005 09:02:35 -0000	1.301
+++ ChangeLog	1 Sep 2005 07:06:40 -0000
@@ -1,3 +1,7 @@
+2005-09-01  Parthasarathi Susarla <sparthasarathi novell com>
+	
+	* confugure.in : Add API_VERSION to config.h
+
 2005-08-29  Harish Krishnaswamy <kharish novell com>
 	
 	* configure.in : Update release number to 2.4.0
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/configure.in,v
retrieving revision 1.134
diff -u -p -r1.134 configure.in
--- configure.in	29 Aug 2005 09:02:35 -0000	1.134
+++ configure.in	1 Sep 2005 07:06:40 -0000
@@ -19,6 +19,7 @@ API_VERSION=1.2
 AC_SUBST(BASE_VERSION)
 AC_SUBST(API_VERSION)
 AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)])
+AC_DEFINE_UNQUOTED(API_VERSION, "$API_VERSION", [Api version (Major.Minor)])
 
 # Libtool versioning
 LIBEDATASERVER_CURRENT=5
Index: camel/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/ChangeLog,v
retrieving revision 1.2474
diff -u -p -r1.2474 ChangeLog
--- camel/ChangeLog	24 Aug 2005 02:35:14 -0000	1.2474
+++ camel/ChangeLog	1 Sep 2005 07:06:43 -0000
@@ -1,3 +1,8 @@
+2005-09-01  Parthasarathi Susarla <sparthasarathi novell com>
+	
+	* camel-lock-client.c: (camel_lock_helper_init):
+	use API_VERSION instead of the BASE_VERSION
+
 2005-08-22  Not Zed  <NotZed Ximian com>
 
 	* camel-store.c (camel_store_rename_folder): init folders and only
Index: camel/camel-lock-client.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/camel-lock-client.c,v
retrieving revision 1.10
diff -u -p -r1.10 camel-lock-client.c
--- camel/camel-lock-client.c	31 Aug 2005 04:21:56 -0000	1.10
+++ camel/camel-lock-client.c	1 Sep 2005 07:06:43 -0000
@@ -124,7 +124,7 @@ static int camel_lock_helper_init(CamelE
 		close(lock_stdout_pipe[1]);
 		for (i=3;i<255;i++)
 			     close(i);
-		execl(CAMEL_LIBEXECDIR "/camel-lock-helper-" BASE_VERSION, "camel-lock-helper", NULL);
+		execl(CAMEL_LIBEXECDIR "/camel-lock-helper-", API_VERSION, "camel-lock-helper", NULL);
 		d(fprintf(stderr, "shit, couldn't exec lock helper!\n"));
 		/* it'll pick this up when it tries to use us */
 		exit(255);