- Update to 2.25.1

- Bump evo_major to 2.26.
- Bump eds_version to 2.25.1.

.cvsignore

@@ -1 +1 @@
-evolution-2.24.1.tar.bz2
+evolution-2.25.1.tar.bz2

evolution-2.23.4-experimental-plugins.patch

@@ -1,38 +0,0 @@
-diff -up evolution-2.23.4/configure.experimental-plugins evolution-2.23.4/configure
---- evolution-2.23.4/configure.experimental-plugins	2008-06-19 08:34:44.000000000 -0400
-+++ evolution-2.23.4/configure	2008-06-19 08:35:07.000000000 -0400
-@@ -38556,13 +38556,13 @@ plugins_base_always="calendar-file calen
- plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN "
- all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
- 
--plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates"
-+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore templates"
- 
- plugins_standard="$plugins_standard_always"
- all_plugins_standard="$plugins_standard"
- 
- plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor hula-account-setup"
--plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN"
-+plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN email-custom-header"
- all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
- 
- case x"$enable_plugins" in
-diff -up evolution-2.23.4/configure.in.experimental-plugins evolution-2.23.4/configure.in
---- evolution-2.23.4/configure.in.experimental-plugins	2008-06-19 08:34:01.000000000 -0400
-+++ evolution-2.23.4/configure.in	2008-06-19 08:34:35.000000000 -0400
-@@ -1732,13 +1732,13 @@ plugins_base_always="calendar-file calen
- plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " 
- all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
- 
--plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates" 
-+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore templates" 
- 
- plugins_standard="$plugins_standard_always"
- all_plugins_standard="$plugins_standard"
- 
- plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor hula-account-setup"
--plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN"
-+plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN email-custom-header"
- all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
- 
- case x"$enable_plugins" in

evolution.spec

@@ -1,6 +1,6 @@
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
-%define eds_version 2.24.1
+%define eds_version 2.25.1
 %define glib2_version 2.16.0
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.19.91
@@ -16,7 +16,7 @@
 %define scrollkeeper_version 0.1.4
 %define soup_version 2.2.2
 
-%define evo_major 2.24
+%define evo_major 2.26
 
 %define exchange_support 1
 %define inline_audio_support 1
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.24.1
+Version: 2.25.1
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -77,9 +77,6 @@ Patch13: evolution-2.7.1-no-gnome-common.patch
 # RH bug #176400
 Patch14: evolution-2.9.1-im-context-reset.patch
 
-# Don't ship broken plugins as stable
-Patch15: evolution-2.23.4-experimental-plugins.patch
-
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -231,7 +228,6 @@ This package contains supplemental utilities for %{name} that require Perl.
 %patch12 -p1 -b .fix-conduit-dir
 %patch13 -p1 -b .no-gnome-common
 %patch14 -p1 -b .im-context-reset
-%patch15 -p1 -b .experimental-plugins
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -406,6 +402,7 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null
 
 %post bogofilter
@@ -433,6 +430,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas
 %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas
+%{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas
 %{_sysconfdir}/gconf/schemas/evolution-mail.schemas
 
 # The main executable
@@ -550,6 +548,9 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-default-source.eplug
 %{evo_plugin_dir}/liborg-gnome-default-source.so
 
+%{evo_plugin_dir}/org-gnome-email-custom-header.eplug
+%{evo_plugin_dir}/liborg-gnome-email-custom-header.so
+
 %{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so
 
@@ -600,9 +601,6 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-mark-all-read.eplug
 %{evo_plugin_dir}/liborg-gnome-mark-all-read.so
 
-%{evo_plugin_dir}/org-gnome-mark-calendar-offline.eplug
-%{evo_plugin_dir}/liborg-gnome-mark-calendar-offline.so
-
 %{evo_plugin_dir}/org-gnome-plugin-manager.eplug
 %{evo_plugin_dir}/liborg-gnome-plugin-manager.so
 %{evo_plugin_dir}/org-gnome-plugin-manager.xml
@@ -696,6 +694,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Mon Nov 03 2008 Matthew Barnes <mbarnes@redhat.com> - 2.25.1-1.fc11
+- Update to 2.25.1
+- Bump evo_major to 2.26.
+- Bump eds_version to 2.25.1.
+
 * Tue Oct 21 2008 Matthew Barnes <mbarnes@redhat.com> - 2.24.1-2.fc10
 - Bump eds_version to 2.24.1 (unfortunately).
 

sources

@@ -1 +1 @@
-d770bfddf8a79b841c515f756cb5af4b  evolution-2.24.1.tar.bz2
+c9623df3e930e5d775527bb8851183bc  evolution-2.25.1.tar.bz2