- Update to 2.22.0

.cvsignore

@@ -1 +1 @@
-evolution-data-server-2.21.92.tar.bz2
+evolution-data-server-2.22.0.tar.bz2

evolution-data-server-2.21.92-implicit-function-declarations.patch

@@ -1,33 +0,0 @@
-diff -up evolution-data-server-2.21.92/calendar/libical/examples/access_properties_and_parameters.c.implicit-function-declarations evolution-data-server-2.21.92/calendar/libical/examples/access_properties_and_parameters.c
---- evolution-data-server-2.21.92/calendar/libical/examples/access_properties_and_parameters.c.implicit-function-declarations	2008-02-25 13:19:45.000000000 -0500
-+++ evolution-data-server-2.21.92/calendar/libical/examples/access_properties_and_parameters.c	2008-02-25 13:19:53.000000000 -0500
-@@ -1,6 +1,7 @@
- /* access_properties_and_parameters.c */
- 
- #include <libical/ical.h>
-+#include <stdlib.h>
- #include <string.h>
- 
- /* Get a particular parameter out of a component. This routine will
-diff -up evolution-data-server-2.21.92/calendar/libical/src/test/regression-classify.c.implicit-function-declarations evolution-data-server-2.21.92/calendar/libical/src/test/regression-classify.c
---- evolution-data-server-2.21.92/calendar/libical/src/test/regression-classify.c.implicit-function-declarations	2008-02-22 04:50:11.000000000 -0500
-+++ evolution-data-server-2.21.92/calendar/libical/src/test/regression-classify.c	2008-02-25 12:49:18.000000000 -0500
-@@ -31,6 +31,7 @@
- 
- #include <stdio.h> /* for printf */
- #include <errno.h>
-+#include <stdlib.h> /* for free */
- #include <string.h> /* For strerror */
- 
- #include <libical/ical.h>
-diff -up evolution-data-server-2.21.92/calendar/libical/src/test/regression-component.c.implicit-function-declarations evolution-data-server-2.21.92/calendar/libical/src/test/regression-component.c
---- evolution-data-server-2.21.92/calendar/libical/src/test/regression-component.c.implicit-function-declarations	2008-02-22 04:50:11.000000000 -0500
-+++ evolution-data-server-2.21.92/calendar/libical/src/test/regression-component.c	2008-02-25 12:49:18.000000000 -0500
-@@ -1,6 +1,7 @@
- #include <libical/ical.h>
- #include "regression.h"
- 
-+#include <stdlib.h>
- #include <string.h>
- extern int VERBOSE;
- 

evolution-data-server-2.22.0-implicit-function-declaration.patch

@@ -0,0 +1,22 @@
+diff -up evolution-data-server-2.22.0/calendar/libical/examples/access_properties_and_parameters.c.implicit-function-declaration evolution-data-server-2.22.0/calendar/libical/examples/access_properties_and_parameters.c
+--- evolution-data-server-2.22.0/calendar/libical/examples/access_properties_and_parameters.c.implicit-function-declaration	2008-03-10 12:39:02.000000000 -0400
++++ evolution-data-server-2.22.0/calendar/libical/examples/access_properties_and_parameters.c	2008-03-10 12:39:18.000000000 -0400
+@@ -1,6 +1,7 @@
+ /* access_properties_and_parameters.c */
+ 
+ #include <libical/ical.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ /* Get a particular parameter out of a component. This routine will
+diff -up evolution-data-server-2.22.0/calendar/libical/src/test/regression-classify.c.implicit-function-declaration evolution-data-server-2.22.0/calendar/libical/src/test/regression-classify.c
+--- evolution-data-server-2.22.0/calendar/libical/src/test/regression-classify.c.implicit-function-declaration	2008-02-22 04:50:11.000000000 -0500
++++ evolution-data-server-2.22.0/calendar/libical/src/test/regression-classify.c	2008-03-10 12:28:44.000000000 -0400
+@@ -31,6 +31,7 @@
+ 
+ #include <stdio.h> /* for printf */
+ #include <errno.h>
++#include <stdlib.h> /* for free */
+ #include <string.h> /* For strerror */
+ 
+ #include <libical/ical.h>

evolution-data-server.spec

@@ -5,6 +5,7 @@
 %define nntp_support 1
 
 %define glib2_version 2.15.3
+%define gtk2_version 2.10.0
 %define gtk_doc_version 1.9
 %define intltool_version 0.35.5
 %define libbonobo_version 2.20.3
@@ -26,7 +27,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.21.92
+Version: 2.22.0
 Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -52,8 +53,7 @@ Patch13: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
 # RH bug #243296
 Patch14: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-# Can't have an unstable release without one...
+Patch15: evolution-data-server-2.22.0-implicit-function-declaration.patch
-Patch15: evolution-data-server-2.21.92-implicit-function-declarations.patch
 
 ### Build Dependencies ###
 
@@ -63,10 +63,11 @@ BuildRequires: bison
 BuildRequires: db4-devel
 BuildRequires: flex
 BuildRequires: gettext
-BuildRequires: glib2-devel
+BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-vfs2-devel
 BuildRequires: gnutls-devel
 BuildRequires: gtk-doc >= %{gtk_doc_version}
+BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: libglade2-devel
@@ -132,7 +133,7 @@ This package contains developer documentation for %{name}.
 %patch12 -p1 -b .fix-ldap-query
 %patch13 -p1 -b .camel-folder-summary-crash
 %patch14 -p1 -b .fix-64bit-acinclude
-%patch15 -p1 -b .implicit-function-declarations
+%patch15 -p1 -b .implicit-function-declaration
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -375,6 +376,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Mar 10 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.0-1.fc9
+- Update to 2.22.0
+
 * Mon Feb 25 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.92-1.fc9
 - Update to 2.21.92
 - Remove patch for GNOME bug #516074 (fixed upstream).

sources

@@ -1 +1 @@
-b2a02de49f0f48d3664a107d53140ebb  evolution-data-server-2.21.92.tar.bz2
+0f29044dc21a4bfb915cafafde8f4d6b  evolution-data-server-2.22.0.tar.bz2