rpms/evolution/devel evolution-kb-override-version.patch, 1.1.2.1, 1.1.2.2 evolution.spec, 1.394.2.35, 1.394.2.36

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24455

Modified Files:
      Tag: private-mbarnes-kb
	evolution-kb-override-version.patch evolution.spec 
Log Message:

* Mon Sep 01 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.99-1.kb.1.fc12
- Snapshot of "kill-bonobo" branch at commit f945e64.
- Actual tarball is now 2.29.1, but keep the package at 2.27.99 for easier
  compatibility with Fedora 12.
- Relax evolution-data-server requirement.


evolution-kb-override-version.patch:
 configure.ac |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: evolution-kb-override-version.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/Attic/evolution-kb-override-version.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.1 -r1.1.2.2
--- evolution-kb-override-version.patch	1 Sep 2009 19:06:40 -0000	1.1.2.1
+++ evolution-kb-override-version.patch	1 Sep 2009 19:38:01 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 diff -up evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version evolution-2.29.1-kill-bonobo-f945e64/configure.ac
 --- evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version	2009-09-01 15:02:53.028656991 -0400
-+++ evolution-2.29.1-kill-bonobo-f945e64/configure.ac	2009-09-01 15:03:19.843363079 -0400
++++ evolution-2.29.1-kill-bonobo-f945e64/configure.ac	2009-09-01 15:36:41.818612634 -0400
 @@ -1,7 +1,7 @@
  dnl Evolution Versions
  m4_define([evo_major_version], [2])
@@ -22,3 +22,12 @@ diff -up evolution-2.29.1-kill-bonobo-f9
  
  dnl Upgrade Revision: This is for triggering migration calls between
  dnl varying versions. Reset to 0 whenever BASE_VERSION changes.
+@@ -49,7 +49,7 @@ GTKHTML_PACKAGE=3.14
+ dnl Required Packages
+ m4_define([glib_minimum_version], [2.20.0])
+ m4_define([gtk_minimum_version], [2.16.0])
+-m4_define([eds_minimum_version], [evo_version])
++m4_define([eds_minimum_version], [2.27.91])
+ m4_define([gnome_icon_theme_minimum_version], [2.19.91])
+ m4_define([gnome_desktop_minimum_version], [2.26.0])
+ m4_define([libbonobo_minimum_version], [2.20.3])


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.35
retrieving revision 1.394.2.36
diff -u -p -r1.394.2.35 -r1.394.2.36
--- evolution.spec	1 Sep 2009 19:06:40 -0000	1.394.2.35
+++ evolution.spec	1 Sep 2009 19:38:01 -0000	1.394.2.36
@@ -3,6 +3,7 @@
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
+%define eds_version 2.27.91
 %define glib2_version 2.16.0
 %define gnome_desktop_version 2.26.0
 %define gnome_doc_utils_version 0.8.0
@@ -98,7 +99,7 @@ BuildRequires: byacc
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: desktop-file-utils
-BuildRequires: evolution-data-server-devel
+BuildRequires: evolution-data-server-devel >= %{eds_version}
 BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -683,6 +684,7 @@ rm -rf $RPM_BUILD_ROOT
 - Snapshot of "kill-bonobo" branch at commit f945e64.
 - Actual tarball is now 2.29.1, but keep the package at 2.27.99 for easier
   compatibility with Fedora 12.
+- Relax evolution-data-server requirement.
 
 * Thu Aug 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.27.91-1.kb.2.fc12
 - Snapshot of "kill-bonobo" branch at commit 787ce81.