--- a/base-specs/evolution-data-server.spec	Tue Mar 17 03:34:56 2009 +0000
+++ b/base-specs/evolution-data-server.spec	Tue Mar 17 08:20:24 2009 +0000
@@ -9,12 +9,12 @@
 Name:         evolution-data-server
 License:      LGPL v2
 Group:        System/Libraries/GNOME
-Version:      2.25.92
+Version:      2.26.0
 Release:      2
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      Backend Library for Evolution
-Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
 %if %build_l10n
 Source1:      l10n-configure.sh
 %if %build_l10n
@@ -23,15 +23,11 @@
 %endif
 # date:2006-09-28 owner:sh162551 type:branding
 Patch1:       evolution-data-server-01-libexec.diff
-# date:2009-02-04 owner:jefftsai bugzilla:573870 type:bug
-Patch2:       evolution-data-server-02-conditional-if.diff
-# date:2009-03-09 owner:jefftsai bugzilla:574236 type:bug
-Patch3:       evolution-data-server-03-imap-mail.diff
 
 %if %option_with_sun_branding
 %else
 # date:2009-03-11 owner:jefftsai defect.opensolaris.org:6752 bugster:6791003 type:bug
-Patch4:       evolution-data-server-04-open-address-book-sparc.diff
+Patch2:       evolution-data-server-02-open-address-book-sparc.diff
 %endif
 Docdir:       %{_defaultdocdir}/evolution-data-server
 Autoreqprov:  on
@@ -92,11 +88,9 @@
 sh -x %SOURCE1 --disable-gnu-extensions
 %endif
 %patch1 -p1
-%patch2 -p1
-%patch3 -p0
 %if %option_with_sun_branding
 %else
-%patch4 -p0
+%patch2 -p0
 %endif
 
 %build
@@ -199,6 +193,10 @@
 %{_datadir}/idl/*
 
 %changelog
+* Tue Mar 16 2009 - [email protected]
+- Bump to 2.26.0
+- Remove -02-conditional-if and -03-imap-mail, upstreamed.
+- Rename -04-open-address-book-sparc to -02-open-address-book-sparc
 * Wed Mar 11 2009 - [email protected]
 - Not apply the patch -04-open-address-book-sparc on OpenSolaris.
 * Wed Mar 11 2009 - [email protected]