rpms/evolution/devel evolution-override-eds-version.patch, NONE, 1.1.2.1 .cvsignore, 1.116.2.16, 1.116.2.17 evolution.spec, 1.394.2.32, 1.394.2.33 sources, 1.116.2.20, 1.116.2.21

[Matthew Barnes]

Author: mbarnes

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

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

* Mon Aug 31 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.1-1.kb.1.fc12
- Snapshot of "kill-bonobo" branch at commit e7a7e7d.
- Relax the evolution-data-server version requirement.


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

--- NEW FILE evolution-override-eds-version.patch ---
diff -up evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac.override-eds-version evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac
--- evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac.override-eds-version	2009-08-31 19:07:26.848150729 -0400
+++ evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac	2009-08-31 19:08:12.281366667 -0400
@@ -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])
+dnl m4_define([eds_minimum_version], [evo_version])
 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])
@@ -248,15 +248,15 @@ PKG_CHECK_MODULES([GNOME_PLATFORM],
 AC_SUBST(GNOME_PLATFORM_CFLAGS)
 AC_SUBST(GNOME_PLATFORM_LIBS)
 
-PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER],
-	[libebook-$EDS_PACKAGE >= eds_minimum_version
-	 libecal-$EDS_PACKAGE >= eds_minimum_version
-	 libedataserver-$EDS_PACKAGE >= eds_minimum_version
-	 libedataserverui-$EDS_PACKAGE >= eds_minimum_version
-	 libegroupwise-$EDS_PACKAGE >= eds_minimum_version
-	 libebackend-$EDS_PACKAGE >= eds_minimum_version
-	 libgdata-$EDS_PACKAGE >= eds_minimum_version
-	 libgdata-google-$EDS_PACKAGE >= eds_minimum_version])
+dnl PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER],
+dnl 	[libebook-$EDS_PACKAGE >= eds_minimum_version
+dnl 	 libecal-$EDS_PACKAGE >= eds_minimum_version
+dnl 	 libedataserver-$EDS_PACKAGE >= eds_minimum_version
+dnl 	 libedataserverui-$EDS_PACKAGE >= eds_minimum_version
+dnl 	 libegroupwise-$EDS_PACKAGE >= eds_minimum_version
+dnl 	 libebackend-$EDS_PACKAGE >= eds_minimum_version
+dnl 	 libgdata-$EDS_PACKAGE >= eds_minimum_version
+dnl 	 libgdata-google-$EDS_PACKAGE >= eds_minimum_version])
 
 dnl ******************************
 dnl Canberra / Canberra-GTK Sound


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.16
retrieving revision 1.116.2.17
diff -u -p -r1.116.2.16 -r1.116.2.17
--- .cvsignore	27 Aug 2009 23:23:20 -0000	1.116.2.16
+++ .cvsignore	31 Aug 2009 23:11:01 -0000	1.116.2.17
@@ -1 +1 @@
-evolution-2.27.91-kill-bonobo-787ce81.tar.bz2
+evolution-2.29.1-kill-bonobo-e7a7e7d.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.32
retrieving revision 1.394.2.33
diff -u -p -r1.394.2.32 -r1.394.2.33
--- evolution.spec	27 Aug 2009 23:23:20 -0000	1.394.2.32
+++ evolution.spec	31 Aug 2009 23:11:01 -0000	1.394.2.33
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 787ce81
+%define hash e7a7e7d
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -45,8 +45,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.27.91
-Release: 1.kb.2%{?dist}
+Version: 2.29.1
+Release: 1.kb.1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -69,6 +69,10 @@ Patch11: evolution-2.5.4-fix-conduit-dir
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
+# Override the evolution-data-server version requirement,
+# since e-d-s version 2.29 will never exist in Fedora 12.
+Patch13: evolution-override-eds-version.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -95,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 >= %{version}
+BuildRequires: evolution-data-server-devel
 BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -229,6 +233,7 @@ This package contains supplemental utili
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
+%patch13 -p1 -b .override-eds-version
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -675,6 +680,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Mon Aug 31 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.1-1.kb.1.fc12
+- Snapshot of "kill-bonobo" branch at commit e7a7e7d.
+- Relax the evolution-data-server version 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.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.20
retrieving revision 1.116.2.21
diff -u -p -r1.116.2.20 -r1.116.2.21
--- sources	27 Aug 2009 23:23:20 -0000	1.116.2.20
+++ sources	31 Aug 2009 23:11:01 -0000	1.116.2.21
@@ -1 +1 @@
-de28e832eb2975ee0cf40ed7690d4fe6  evolution-2.27.91-kill-bonobo-787ce81.tar.bz2
+e838844dc46e59e95c37719fd95bbdb2  evolution-2.29.1-kill-bonobo-e7a7e7d.tar.bz2