diff --git a/evolution-data-server.spec b/evolution-data-server.spec index a721fba..5d548a9 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -6,7 +6,7 @@ Summary: Backend data server for evolution Name: evolution-data-server Version: 1.0.2 -Release: 5 +Release: 6 License: GPL Group: System Environment/Libraries Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2 @@ -18,6 +18,9 @@ Patch4: evolution-data-server-1.0.2-fix-calendar-factory-GType.patch # Patch for Red Hat bug #141283 (in Ximian bugzilla as 59904) Patch5: evolution-data-server-1.0.2-calendar-optimisation-XB59904.patch +# Patch for another part of bug #141283 (in Ximian bugzilla as 70267) +Patch6: evolution-data-server-1.0.2-calendar-optimisation-XB70267.patch + BuildRoot: %{_tmppath}/%{name}-root Requires: libsoup >= %{soup_version} Requires: ORBit2 >= %{orbit2_version} @@ -49,9 +52,13 @@ evolution-data-server. %patch3 -p1 -b .workaround-cal-backend-leak %patch4 -p1 -b .fix-calendar-factory-GType + cd calendar %patch5 -p0 -b .calendar-optimisation-XB59904 +cd .. +%patch6 -p0 -b .calendar-optimisation-XB70267 + %build export tagname=CC CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS @@ -94,6 +101,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Dec 7 2004 David Malcolm - 1.0.2-6 +- Amortize writes to a local cache of a webcal calendar, fixing further aspect of #141283 (upstream bugzilla #70267), as posted to mailing list here: +http://lists.ximian.com/archives/public/evolution-patches/2004-December/008338.html +(The groupwise part of that patch did not cleanly apply, so I removed it). + * Thu Dec 2 2004 David Malcolm - 1.0.2-5 - Added fix for #141283 (upstream bugzilla XB 59904), a backported calendar optimisation patch posted to upstream development mailing list here: