--- a/base-specs/evolution-data-server.spec	Tue Dec 22 06:34:40 2009 +0000
+++ b/base-specs/evolution-data-server.spec	Tue Dec 22 07:29:54 2009 +0000
@@ -12,7 +12,7 @@
 Name:         evolution-data-server
 License:      LGPL v2
 Group:        System/Libraries/GNOME
-Version:      2.29.3
+Version:      2.29.4
 Release:      2
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -26,24 +26,18 @@
 %endif
 %if %option_with_sun_branding
 # date:2009-03-11 owner:jefftsai doo:6752 bugster:6791003 type:bug
-Patch2:       evolution-data-server-02-open-address-book-sparc.diff
+Patch1:       evolution-data-server-01-open-address-book-sparc.diff
 %endif
 # date:2009-10-13 owner:jefftsai bugzilla:593998 bugster:6878377 type:bug
-Patch3:       evolution-data-server-03-ldap-search.diff
+Patch2:       evolution-data-server-02-ldap-search.diff
 # date:2009-12-02 owner:jedy bugzilla:603557 doo:12904 type:bug
-Patch4:       evolution-data-server-04-a11y-crash.diff
-# date:2009-12-03 owner:jefftsai type:branding bugzilla:410164
-Patch5:       evolution-data-server-05-remove-bdb.diff
+Patch3:       evolution-data-server-03-remove-bdb.diff
 # date:2009-12-03 owner:jefftsai type:branding
-Patch6:       evolution-data-server-06-not-build-test.diff
+Patch4:       evolution-data-server-04-not-build-test.diff
 # date:2009-12-03 owner:jefftsai type:bug bugzilla:603773
-Patch7:       evolution-data-server-07-comm-err.diff
+Patch5:       evolution-data-server-05-comm-err.diff
 # date:2009-12-03 owner:jefftsai bugzilla:603772 type:bug
-Patch8:       evolution-data-server-08-marshal-list.diff
-# date:2009-12-03 owner:jefftsai bugzilla:603770 type:bug
-Patch9:       evolution-data-server-09-func-macro.diff
-# date:2009-12-03 owner:jefftsai bugzilla:603771 type:bug
-Patch10:       evolution-data-server-10-union.diff
+Patch6:       evolution-data-server-06-marshal-list.diff
 Docdir:       %{_defaultdocdir}/evolution-data-server
 Autoreqprov:  on
 Prereq:       /sbin/ldconfig
@@ -106,6 +100,7 @@
 # bugster 6558756
 sh -x %SOURCE1 --disable-gnu-extensions
 %endif
+%patch1 -p1
 %if %option_with_sun_branding
 %patch2 -p1
 %endif
@@ -113,10 +108,6 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 %build
 
@@ -146,8 +137,6 @@
 %define iconv_option
 %endif
 
-export LDFLAGS="$LDFLAGS -R`pkg-config --variable=libdir nss` -R`pkg-config --variable=libdir nspr`"
-
 aclocal $ACLOCAL_FLAGS -I m4
 glib-gettextize --force --copy
 intltoolize --force --automake
@@ -213,6 +202,12 @@
 %{_datadir}/idl/*
 
 %changelog
+* Tue Dec 22 2009 - [email protected]
+- Bump to 2.29.4.
+- Remove patch -04-a11y-crash.diff.
+- Remove patch -09-func-macro.diff.
+- Remove patch -10-union.diff.
+- Reorder the other patches.
 * Wed Dec 09 2009 - [email protected]
 - Remove patch -01-libexec, since evolution-data-server does not exist
 * Tue Dec 08 2009 - [email protected]