rpms/evolution/devel evolution-kb-override-version.patch, NONE, 1.1.2.1 .cvsignore, 1.116.2.17, 1.116.2.18 evolution.spec, 1.394.2.34, 1.394.2.35 sources, 1.116.2.21, 1.116.2.22 evolution-override-eds-version.patch, 1.1.2.1, NONE

[Matthew Barnes]

Author: mbarnes

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

Modified Files:
      Tag: private-mbarnes-kb
	.cvsignore evolution.spec sources 
Added Files:
      Tag: private-mbarnes-kb
	evolution-kb-override-version.patch 
Removed Files:
      Tag: private-mbarnes-kb
	evolution-override-eds-version.patch 
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.


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

--- NEW FILE evolution-kb-override-version.patch ---
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
@@ -1,7 +1,7 @@
 dnl Evolution Versions
 m4_define([evo_major_version], [2])
-m4_define([evo_minor_version], [29])
-m4_define([evo_micro_version], [1])
+m4_define([evo_minor_version], [27])
+m4_define([evo_micro_version], [99])
 m4_define([evo_version],
 	[evo_major_version.evo_minor_version.evo_micro_version])
 m4_define([evo_stable_version],
@@ -13,8 +13,8 @@ dnl Base Version: This is for API/versio
 dnl Bonobo server files.  This should always be the major/minor of
 dnl the stable version or stable version to be.  Note, this is set
 dnl the way it is so that GETTEXT_PACKAGE will be parsed correctly.
-BASE_VERSION=2.30
-m4_define([base_version], [2.30])
+BASE_VERSION=2.28
+m4_define([base_version], [2.28])
 
 dnl Upgrade Revision: This is for triggering migration calls between
 dnl varying versions. Reset to 0 whenever BASE_VERSION changes.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.17
retrieving revision 1.116.2.18
diff -u -p -r1.116.2.17 -r1.116.2.18
--- .cvsignore	31 Aug 2009 23:11:01 -0000	1.116.2.17
+++ .cvsignore	1 Sep 2009 19:06:40 -0000	1.116.2.18
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-e7a7e7d.tar.bz2
+evolution-2.29.1-kill-bonobo-f945e64.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.34
retrieving revision 1.394.2.35
diff -u -p -r1.394.2.34 -r1.394.2.35
--- evolution.spec	31 Aug 2009 23:48:21 -0000	1.394.2.34
+++ evolution.spec	1 Sep 2009 19:06:40 -0000	1.394.2.35
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash e7a7e7d
+%define hash f945e64
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -45,14 +45,14 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.29.1
+Version: 2.27.99
 Release: 1.kb.1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: http://projects.gnome.org/evolution/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: %{name}-%{version}-kill-bonobo-%{hash}.tar.bz2
+Source: %{name}-2.29.1-kill-bonobo-%{hash}.tar.bz2
 
 Obsoletes: libgal2 <= %{last_libgal2_version}
 
@@ -69,9 +69,8 @@ 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
+# Override the version to 2.27.99 (and API_VERSION to 2.28).
+Patch13: evolution-kb-override-version.patch
 
 ## Dependencies ###
 
@@ -229,11 +228,11 @@ Requires: %{name} = %{version}-%{release
 This package contains supplemental utilities for %{name} that require Perl.
 
 %prep
-%setup -q -n evolution-%{version}-kill-bonobo-%{hash}
+%setup -q -n %{name}-2.29.1-kill-bonobo-%{hash}
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
-%patch13 -p1 -b .override-eds-version
+%patch13 -p1 -b .override-version
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -680,10 +679,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.
-- Bump evo_major to 2.30.
+* 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.
 
 * 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.21
retrieving revision 1.116.2.22
diff -u -p -r1.116.2.21 -r1.116.2.22
--- sources	31 Aug 2009 23:11:01 -0000	1.116.2.21
+++ sources	1 Sep 2009 19:06:40 -0000	1.116.2.22
@@ -1 +1 @@
-e838844dc46e59e95c37719fd95bbdb2  evolution-2.29.1-kill-bonobo-e7a7e7d.tar.bz2
+658fce6142a8c152cde3054c1086a849  evolution-2.29.1-kill-bonobo-f945e64.tar.bz2


--- evolution-override-eds-version.patch DELETED ---