rpms/evolution/devel .cvsignore, 1.116.2.27, 1.116.2.28 evolution-kb-override-version.patch, 1.1.2.4, 1.1.2.5 evolution.spec, 1.394.2.64, 1.394.2.65 sources, 1.116.2.32, 1.116.2.33

[Matthew Barnes]

Author: mbarnes

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

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

* Thu Oct 29 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.4.fc12
- Snapshot of "kill-bonobo" progress at commit adadf13.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.116.2.27
retrieving revision 1.116.2.28
diff -u -p -r1.116.2.27 -r1.116.2.28
--- .cvsignore	29 Sep 2009 11:36:21 -0000	1.116.2.27
+++ .cvsignore	30 Oct 2009 03:15:29 -0000	1.116.2.28
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-2fa61f4.tar.bz2
+evolution-2.29.2-kill-bonobo-adadf13.tar.bz2

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.4
retrieving revision 1.1.2.5
diff -u -p -r1.1.2.4 -r1.1.2.5
--- evolution-kb-override-version.patch	9 Sep 2009 02:54:29 -0000	1.1.2.4
+++ evolution-kb-override-version.patch	30 Oct 2009 03:15:29 -0000	1.1.2.5
@@ -1,11 +1,11 @@
-diff -up evolution-2.29.1-kill-bonobo-0a47d87/configure.ac.override-version evolution-2.29.1-kill-bonobo-0a47d87/configure.ac
---- evolution-2.29.1-kill-bonobo-0a47d87/configure.ac.override-version	2009-09-08 19:41:23.000000000 -0400
-+++ evolution-2.29.1-kill-bonobo-0a47d87/configure.ac	2009-09-08 22:53:53.636195371 -0400
+diff -up evolution-2.29.2-kill-bonobo-0a47d87/configure.ac.override-version evolution-2.29.2-kill-bonobo-0a47d87/configure.ac
+--- evolution-2.29.2-kill-bonobo-0a47d87/configure.ac.override-version	2009-09-08 19:41:23.000000000 -0400
++++ evolution-2.29.2-kill-bonobo-0a47d87/configure.ac	2009-09-08 22:53:53.636195371 -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_micro_version], [2])
 +m4_define([evo_minor_version], [27])
 +m4_define([evo_micro_version], [99])
  m4_define([evo_version],
@@ -30,4 +30,4 @@ diff -up evolution-2.29.1-kill-bonobo-0a
 +m4_define([eds_minimum_version], [2.27.1])
  m4_define([gnome_icon_theme_minimum_version], [2.19.91])
  m4_define([gnome_desktop_minimum_version], [2.26.0])
- m4_define([libgtkhtml_minimum_version], [3.27.90])
+ m4_define([libgtkhtml_minimum_version], [3.29.1])


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.394.2.64
retrieving revision 1.394.2.65
diff -u -p -r1.394.2.64 -r1.394.2.65
--- evolution.spec	29 Sep 2009 12:35:54 -0000	1.394.2.64
+++ evolution.spec	30 Oct 2009 03:15:29 -0000	1.394.2.65
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 2fa61f4
+%define hash adadf13
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -45,13 +45,13 @@
 
 Name: evolution
 Version: 2.28.99
-Release: 1.kb.3%{?dist}
+Release: 1.kb.4%{?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}-2.29.1-kill-bonobo-%{hash}.tar.bz2
+Source: %{name}-2.29.2-kill-bonobo-%{hash}.tar.bz2
 
 Obsoletes: libgal2 <= %{last_libgal2_version}
 
@@ -222,7 +222,7 @@ Requires: %{name} = %{version}-%{release
 This package contains supplemental utilities for %{name} that require Perl.
 
 %prep
-%setup -q -n %{name}-2.29.1-kill-bonobo-%{hash}
+%setup -q -n %{name}-2.29.2-kill-bonobo-%{hash}
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
@@ -657,6 +657,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Thu Oct 29 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.4.fc12
+- Snapshot of "kill-bonobo" progress at commit adadf13.
+
 * Tue Sep 29 2009 Matthew Barnes <mbarnes at redhat.com> - 2.28.99-1.kb.3.fc12
 - Snapshot of "kill-bonobo" progress at commit 2fa61f4.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.116.2.32
retrieving revision 1.116.2.33
diff -u -p -r1.116.2.32 -r1.116.2.33
--- sources	29 Sep 2009 11:36:22 -0000	1.116.2.32
+++ sources	30 Oct 2009 03:15:29 -0000	1.116.2.33
@@ -1 +1 @@
-6f3e9f57c256b2596df051a6e42ca3b8  evolution-2.29.1-kill-bonobo-2fa61f4.tar.bz2
+a4e70c3dacff4169f9ae4fcc626b7a27  evolution-2.29.2-kill-bonobo-adadf13.tar.bz2