- Add patch for RH bug #210142 (calendar crash in indic locales).

This commit is contained in:
Matthew Barnes 2006-11-10 04:09:57 +00:00
parent 305df9566f
commit 4643592812
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,28 @@
--- 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;
}
/**

View File

@ -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 @@ Patch23: evolution-data-server-1.9.1-fix-categories.patch
# 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 @@ evolution-data-server.
%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 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
%changelog
* Fri Nov 10 2006 Matthew Barnes <mbarnes@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@redhat.com> - 1.9.2-2.fc7
- Add patch for RH bug #203058 (name selector dialog glitch).