rpms/evolution-data-server/devel evolution-data-server-1.9.2-strftime.patch, NONE, 1.1 evolution-data-server.spec, 1.138, 1.139

[fedora-cvs-commits at redhat.com]

Author: mbarnes

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7854

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.9.2-strftime.patch 
Log Message:

* Fri Nov 10 2006 Matthew Barnes <mbarnes at redhat.com> - 1.9.2-3.fc7
- Add patch for RH bug #210142 (calendar crash in indic locales).


evolution-data-server-1.9.2-strftime.patch:
 e-data-server-util.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE evolution-data-server-1.9.2-strftime.patch ---
--- evolution-data-server-1.9.2/libedataserver/e-data-server-util.c.strftime	2006-11-09 22:40:39.000000000 -0500
+++ evolution-data-server-1.9.2/libedataserver/e-data-server-util.c	2006-11-09 22:43:54.000000000 -0500
@@ -335,11 +335,11 @@
  **/
 size_t e_strftime(char *s, size_t max, const char *fmt, const struct tm *tm)
 {
+	size_t ret;
 #ifdef HAVE_LKSTRFTIME
-	return strftime(s, max, fmt, tm);
+	ret = strftime(s, max, fmt, tm);
 #else
 	char *c, *ffmt, *ff;
-	size_t ret;
 
 	ffmt = g_strdup(fmt);
 	ff = ffmt;
@@ -365,8 +365,10 @@
 
 	ret = strftime(s, max, ffmt, tm);
 	g_free(ffmt);
-	return ret;
 #endif
+	if (ret == 0 && max > 0)
+		s[0] = '\0';
+	return ret;
 }
 
 /** 


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- evolution-data-server.spec	8 Nov 2006 17:20:13 -0000	1.138
+++ evolution-data-server.spec	10 Nov 2006 04:09:57 -0000	1.139
@@ -25,7 +25,7 @@
 
 Name: evolution-data-server
 Version: 1.9.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -71,6 +71,9 @@
 # RH bug #203058
 Patch24: evolution-data-server-1.9.2-fix-name-selector-dialog.patch
 
+# RH bug #210142
+Patch25: evolution-data-server-1.9.2-strftime.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -162,6 +165,7 @@
 %patch22 -p1 -b .kill-ememory
 %patch23 -p1 -b .fix-categories
 %patch24 -p1 -b .fix-name-selector-dialog
+%patch25 -p1 -b .strftime
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -379,6 +383,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Fri Nov 10 2006 Matthew Barnes <mbarnes at redhat.com> - 1.9.2-3.fc7
+- Add patch for RH bug #210142 (calendar crash in indic locales).
+
 * Wed Nov 08 2006 Matthew Barnes <mbarnes at redhat.com> - 1.9.2-2.fc7
 - Add patch for RH bug #203058 (name selector dialog glitch).