From 4aee6561f008a52580dfc8216e6606d1c1dd055a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 24 Jul 2008 04:02:15 +0000 Subject: [PATCH] - Update to 2.23.5 - Bump eds_version to 2.23.5. --- .cvsignore | 2 +- evolution-2.23.4-experimental-plugins.patch | 8 ++++---- evolution.spec | 16 +++++++++++++--- sources | 2 +- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index fbcef1b..7181959 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.23.4.tar.bz2 +evolution-2.23.5.tar.bz2 diff --git a/evolution-2.23.4-experimental-plugins.patch b/evolution-2.23.4-experimental-plugins.patch index 038ec31..5a3cb86 100644 --- a/evolution-2.23.4-experimental-plugins.patch +++ b/evolution-2.23.4-experimental-plugins.patch @@ -5,8 +5,8 @@ diff -up evolution-2.23.4/configure.experimental-plugins evolution-2.23.4/config 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" -+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" +-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" @@ -24,8 +24,8 @@ diff -up evolution-2.23.4/configure.in.experimental-plugins evolution-2.23.4/con 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" -+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" +-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" diff --git a/evolution.spec b/evolution.spec index 68d0c0f..0535bcd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.23.3 +%define eds_version 2.23.5 %define glib2_version 2.16.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.23.4 -Release: 3%{?dist} +Version: 2.23.5 +Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -366,6 +366,7 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null 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/evolution-mail.schemas > /dev/null %post bogofilter @@ -392,6 +393,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas %{_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/evolution-mail.schemas # The main executable @@ -574,6 +576,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-subject-thread.eplug %{evo_plugin_dir}/liborg-gnome-subject-thread.so +%{evo_plugin_dir}/templates.glade +%{evo_plugin_dir}/org-gnome-templates.eplug +%{evo_plugin_dir}/liborg-gnome-templates.so + %{evo_plugin_dir}/org-gnome-evolution-hula-account-setup.eplug %{evo_plugin_dir}/liborg-gnome-evolution-hula-account-setup.so @@ -646,6 +652,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Tue Jul 22 2008 Matthew Barnes - 2.23.5-1.fc10 +- Update to 2.23.5 +- Bump eds_version to 2.23.5. + * Fri Jul 18 2008 Tom "spot" Callaway - 2.23.4-3.fc10 - fix license tag - fix patches to apply with fuzz=0 diff --git a/sources b/sources index 243813b..ff9f24e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5a6ceba4a7cdb33fb02fe32e1c58cb40 evolution-2.23.4.tar.bz2 +ea19190dec55a30b106ebb9da5de8b70 evolution-2.23.5.tar.bz2