--- a/ChangeLog	Thu May 10 15:14:08 2007 +0000
+++ b/ChangeLog	Thu May 10 15:44:31 2007 +0000
@@ -1,3 +1,13 @@
+2007-05-10  Damien Carbery <[email protected]>
+
+	* base-specs/evolution.spec: Bump to 2.11.1.1. Bump major_version to
+	  2.12.
+	* SUNWevolution.spec: Add bogo-junk-plugin-2.12.schemas file to %files.
+	* base-specs/evolution-exchange.spec: Remove patch 02-evo-api-ver as
+	  evolution has been bumped.
+	* patches/evolution-exchange-02-evo-api-ver.diff: Removed because
+	  evolution has been bumped.
+
 2007-05-10  Yandong Yao <[email protected]>
 
 	* closed/SUNWfsexam.spec: Bump to 0.4.2

--- a/SUNWevolution.spec	Thu May 10 15:14:08 2007 +0000
+++ b/SUNWevolution.spec	Thu May 10 15:44:31 2007 +0000
@@ -188,6 +188,7 @@
   echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
   echo 'SDIR=$BASEDIR%{_sysconfdir}/gconf/schemas';
   echo 'schemas="$SDIR/apps-evolution-mail-prompts-checkdefault-%{evolution.major_version}.schemas';
+  echo '         $SDIR/bogo-junk-plugin-%{evolution.major_version}.schemas';
   echo '         $SDIR/apps_evolution_addressbook-%{evolution.major_version}.schemas';
   echo '         $SDIR/apps_evolution_calendar-%{evolution.major_version}.schemas';
   echo '         $SDIR/apps_evolution_shell-%{evolution.major_version}.schemas';
@@ -270,6 +271,7 @@
 %files root
 %defattr (-, root, sys)
 %attr (0755, root, sys) %dir %{_sysconfdir}
+%{_sysconfdir}/gconf/schemas/bogo-junk-plugin-%{evolution.major_version}.schemas
 %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{evolution.major_version}.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evolution.major_version}.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evolution.major_version}.schemas
@@ -277,6 +279,8 @@
 %{_sysconfdir}/gconf/schemas/evolution-mail-%{evolution.major_version}.schemas
 
 %changelog
+* Thu May 10 2007 - [email protected]
+- Add bogo-junk-plugin-2.12.schemas to %files.
 * Thu Apr 26 2007 - [email protected]
 - set PERL to /usr/perl5/bin/perl
 * Tue Apr 24 2007 - [email protected]

--- a/base-specs/evolution-exchange.spec	Thu May 10 15:14:08 2007 +0000
+++ b/base-specs/evolution-exchange.spec	Thu May 10 15:44:31 2007 +0000
@@ -18,8 +18,6 @@
 Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.11/%{name}-%{version}.tar.bz2
 # date:2006-12-13 bugzilla:385354 owner:jedy type:bug
 Patch1:       evolution-exchange-01-sun-ldap.diff
-# date:2007-05-10 owner:dcarbery type:bug
-Patch2:       evolution-exchange-02-evo-api-ver.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/ximian-connector
@@ -60,7 +58,6 @@
 %prep
 %setup -q
 %patch1 -p0
-%patch2 -p1
 
 %build
 
@@ -113,7 +110,7 @@
 
 %changelog
 * Thu May 10 2007 - [email protected]
-- Bump to 2.11.1. Add temp patch to build against 2.10 version of Evolution.
+- Bump to 2.11.1.
 * Thu Apr 12 2007 - [email protected]
 - Bump to 2.10.1.
 * Tue Mar 13 2007 - [email protected]

--- a/base-specs/evolution.spec	Thu May 10 15:14:08 2007 +0000
+++ b/base-specs/evolution.spec	Thu May 10 15:44:31 2007 +0000
@@ -11,6 +11,8 @@
 Name:         evolution
 License:      GPL
 Group:        System/GUI/GNOME
+# major_version is generally a 'stable' build number i.e. has an even number.
+%define major_version 2.12
 Version:      2.11.1.1
 Release:      1
 Distribution: java-desktop-system
@@ -55,7 +57,6 @@
 Prereq:       sh-utils
 Prereq:       GConf
 
-%define major_version 2.10
 
 %define GConf_version 2.5.0
 %define gtkhtml_version 3.2
@@ -246,7 +247,7 @@
 
 %changelog
 * Thu May 10 2007 - [email protected]
-- Bump to 2.11.1.1.
+- Bump to 2.11.1.1. Bump major_version to 2.12.
 * Thu Apr 26 2007 - [email protected]
 - add patch perl-path.diff
 * Thu Apr 12 2007 - [email protected]

--- a/patches/evolution-exchange-02-evo-api-ver.diff	Thu May 10 15:14:08 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- evolution-exchange-2.11.1/configure.in.orig	2007-05-10 13:01:33.814286300 +0100
-+++ evolution-exchange-2.11.1/configure.in	2007-05-10 13:01:43.130177400 +0100
-@@ -20,7 +20,7 @@
- 
- dnl Update these for every new development release of evolution. These numbers
- dnl actually correspond to the next stable release number
--EVOLUTION_API_VERSION=2.12
-+EVOLUTION_API_VERSION=2.10
- EDS_API_VERSION=1.2
- EDS_BASE_VERSION=1.12
-