- Update to 2.9.4

- Bump eds_version to 1.9.4 due to soname changes.
- Remove patch for GNOME bug #382431 (fixed upstream).

.cvsignore

@@ -1,4 +1,4 @@
-evolution-2.9.3.tar.bz2
+evolution-2.9.4.tar.bz2
 evolution16.png
 evolution22.png
 evolution24.png

evolution.spec

@@ -1,7 +1,7 @@
 %define bug_buddy_version 2.15.90
 %define dbus_glib_version 0.70
 %define dbus_version 0.90
-%define eds_version 1.9.1
+%define eds_version 1.9.4
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 1.3.6
 %define gnome_pilot_version 2.0.13
@@ -43,8 +43,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.9.3
-Release: 4%{?dist}
+Version: 2.9.4
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -146,9 +146,6 @@ Patch36: evolution-2.9.2-pilot-link-0.12.patch
 # RH bug #215466 / RH bug #218589 / GNOME bug #377511
 Patch37: evolution-2.9.2-optional-participant.patch
 
-# GNOME bug #382431
-Patch38: evolution-2.9.3-implicit-function-declaration.patch
-
 # RH bug #215695 / GNOME bug #383027
 Patch39: evolution-2.9.3-dont-assume-default-account.patch
 
@@ -167,6 +164,9 @@ Patch43: evolution-2.9.3-unread-messages.patch
 # RH bug #215467 / GNOME bug #380644
 Patch44: evolution-2.9.3-meeting-list-view.patch
 
+# GNOME bug #373116
+Patch45: evolution-2.9.3-gtk-color-button.patch
+
 ## Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -307,13 +307,13 @@ Development files needed for building things which link against evolution.
 %patch35 -p1 -b .gtk-font-button
 %patch36 -p1 -b .pilot-link-0.12
 %patch37 -p1 -b .optional-participant
-%patch38 -p1 -b .implicit-function-declaration
 %patch39 -p1 -b .dont-assume-default-account
 #%patch40 -p1 -b .view-attachment-uri
 %patch41 -p1 -b .adopt-icons
 %patch42 -p1 -b .source-path-entry
 %patch43 -p1 -b .unread-messages
 %patch44 -p1 -b .meeting-list-view
+%patch45 -p1 -b .gtk-color-button
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -395,6 +395,7 @@ CFLAGS="$CFLAGS \
 	-DG_DISABLE_DEPRECATED=1 \
 	-DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
 	-DGDK_DISABLE_DEPRECATED=1 \
+	-DEDS_DISABLE_DEPRECATED=1 \
 	-Werror-implicit-function-declaration"
 %endif
 
@@ -728,6 +729,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Dec 19 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.4-1.fc7
+- Update to 2.9.4
+- Bump eds_version to 1.9.4 due to soname changes.
+- Remove patch for GNOME bug #382431 (fixed upstream).
+
+* Fri Dec 15 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.3-5.fc7
+- Add patch for GNOME bug #373116 (use GtkColorButton).
+
 * Fri Dec 15 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.3-4.fc7
 - Disable patch for RH bug #216537, which caused RH bug #219228.
 

sources

@@ -1,4 +1,4 @@
-03c29ef09dbd1b04623f736cbd8e14a7  evolution-2.9.3.tar.bz2
+8915ed5f5b4c0351f05a428111b46216  evolution-2.9.4.tar.bz2
 4737f9b111e5e4b2fccc9e9b464c4b01  evolution16.png
 de663fa442d61f53dc058dd20c77da8e  evolution22.png
 d33896d33b5db2201e051664e96b1100  evolution24.png