[evolution-data-server/f14/master] * Tue Aug 02 2010 Matthew Barnes <mbarnes at redhat.com> - 2.31.6-1.fc14 - Update to 2.31.6 - Resume GS

Matthew Barnes mbarnes at fedoraproject.org
Tue Aug 3 11:10:23 UTC 2010


commit fb69de20ffce2cb2b580cfb3ccc655e621c15f48
Author: Matthew Barnes <mbarnes at redhat.com>
Date:   Tue Aug 3 07:10:17 2010 -0400

    * Tue Aug 02 2010 Matthew Barnes <mbarnes at redhat.com> - 2.31.6-1.fc14
    - Update to 2.31.6
    - Resume GSEAL usage.
    - Drop dbus-glib requirement.
    - Bump glib2 requirement to 2.25.12.

 .gitignore                 |    1 +
 evolution-data-server.spec |   16 ++++++++--------
 sources                    |    2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 55f6338..c45ed72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 evolution-data-server-2.31.5.tar.bz2
+evolution-data-server-2.31.6.tar.bz2
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 0fd924f..92c1c78 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -4,8 +4,7 @@
 %define nntp_support 1
 %define largefile_support 1
 
-%define dbus_glib_version 0.6
-%define glib2_version 2.16.1
+%define glib2_version 2.25.12
 %define gtk2_version 2.20.0
 %define gtk_doc_version 1.9
 %define intltool_version 0.35.5
@@ -25,7 +24,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.31.5
+Version: 2.31.6
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -42,15 +41,11 @@ Obsoletes: evolution-webcal < 2.24.0
 # RH bug #243296
 Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-# no-gseal because of gdk functions for now
-Patch12: evolution-data-server-2.31.3-no-gseal.patch
-
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
 BuildRequires: bison
 BuildRequires: db4-devel
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-common
@@ -123,7 +118,6 @@ This package contains developer documentation for %{name}.
 %setup -q
 
 %patch11 -p1 -b .fix-64bit-acinclude
-%patch12 -p1 -b .no-gseal
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -338,6 +332,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Tue Aug 02 2010 Matthew Barnes <mbarnes at redhat.com> - 2.31.6-1.fc14
+- Update to 2.31.6
+- Resume GSEAL usage.
+- Drop dbus-glib requirement.
+- Bump glib2 requirement to 2.25.12.
+
 * Tue Jul 13 2010 Milan Crha <mcrha at redhat.com> - 2.31.5-1.fc14
 - Update to 2.31.5
 
diff --git a/sources b/sources
index 9b40530..544a248 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b4f12c7ed2bb5aa7ae5c25e9d98fa3d0  evolution-data-server-2.31.5.tar.bz2
+74003a3ec3a463a41c41a4dac9bb6b77  evolution-data-server-2.31.6.tar.bz2


More information about the scm-commits mailing list