From fd134dea776420b8577b2eab1db2981c2aca34f2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 15 Dec 2008 15:38:05 +0000 Subject: [PATCH] - Update to 2.25.3 - New BR: libgweather-devel --- .cvsignore | 2 +- ...ver-2.25.3-implicit-function-declarations.patch | 11 +++++++++++ evolution-data-server.spec | 14 ++++++++++++-- sources | 2 +- 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 evolution-data-server-2.25.3-implicit-function-declarations.patch diff --git a/.cvsignore b/.cvsignore index 3debef7..e886f5f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-data-server-2.25.2.tar.bz2 +evolution-data-server-2.25.3.tar.bz2 diff --git a/evolution-data-server-2.25.3-implicit-function-declarations.patch b/evolution-data-server-2.25.3-implicit-function-declarations.patch new file mode 100644 index 0000000..b3cf4c7 --- /dev/null +++ b/evolution-data-server-2.25.3-implicit-function-declarations.patch @@ -0,0 +1,11 @@ +diff -up evolution-data-server-2.25.3/camel/camel-folder-summary.c.implicit-function-declarations evolution-data-server-2.25.3/camel/camel-folder-summary.c +--- evolution-data-server-2.25.3/camel/camel-folder-summary.c.implicit-function-declarations 2008-12-15 10:23:02.000000000 -0500 ++++ evolution-data-server-2.25.3/camel/camel-folder-summary.c 2008-12-15 10:27:31.000000000 -0500 +@@ -41,6 +41,7 @@ + #include + + #include "camel-db.h" ++#include "camel-debug.h" + #include "camel-file-utils.h" + #include "camel-folder-summary.h" + #include "camel-folder.h" diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 59ae3a0..9de91dd 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -9,6 +9,7 @@ %define gtk_doc_version 1.9 %define intltool_version 0.35.5 %define libbonobo_version 2.20.3 +%define libgweather_version 2.25.2 %define orbit2_version 2.9.8 %define soup_version 2.3.0 %define sqlite_version 3.5 @@ -28,8 +29,8 @@ ### Abstract ### Name: evolution-data-server -Version: 2.25.2 -Release: 2%{?dist} +Version: 2.25.3 +Release: 1%{?dist} License: LGPLv2 Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -54,6 +55,8 @@ Patch12: evolution-data-server-1.10.1-camel-folder-summary-crash.patch # RH bug #243296 Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch +Patch14: evolution-data-server-2.25.3-implicit-function-declarations.patch + ### Build Dependencies ### BuildRequires: GConf2-devel @@ -71,6 +74,7 @@ BuildRequires: libbonobo-devel >= %{libbonobo_version} BuildRequires: libglade2-devel BuildRequires: libgnome-devel BuildRequires: libgnomeui-devel +BuildRequires: libgweather-devel >= %{libgweather_version} BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libtool BuildRequires: sqlite-devel >= %{sqlite_version} @@ -112,6 +116,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-doc = %{version}-%{release} Requires: libbonobo-devel Requires: libgnome-devel +Requires: libgweather-devel Requires: libsoup-devel Requires: sqlite-devel @@ -132,6 +137,7 @@ This package contains developer documentation for %{name}. %patch11 -p1 -b .fix-ldap-query %patch12 -p1 -b .camel-folder-summary-crash %patch13 -p1 -b .fix-64bit-acinclude +%patch14 -p1 -b .implicit-function-declarations mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -377,6 +383,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/libedataserverui %changelog +* Mon Dec 15 2008 Matthew Barnes - 2.25.3-1.fc11 +- Update to 2.25.3 +- New BR: libgweather-devel + * Thu Dec 04 2008 Matthew Barnes - 2.25-2-2.fc11 - Rebuild due to recent pkg-config breakage. diff --git a/sources b/sources index fdd5b3d..6435b0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -202dd1127cc2e8a12cbc7dc6dab8e889 evolution-data-server-2.25.2.tar.bz2 +4dc7d405f18c58a3a8c74f96a88fe0f7 evolution-data-server-2.25.3.tar.bz2