rpms/evolution/devel evolution-2.23.4-experimental-plugins.patch, NONE, 1.1 evolution.spec, 1.344, 1.345 evolution-2.0.2-fix-145552.patch, 1.2, NONE evolution-2.21.92-CVE-2008-0072.patch, 1.1, NONE

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9682

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.23.4-experimental-plugins.patch 
Removed Files:
	evolution-2.0.2-fix-145552.patch 
	evolution-2.21.92-CVE-2008-0072.patch 
Log Message:

* Thu Jun 19 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.4-2.fc10
- Don't ship the unfinished "Custom Header" plugin.


evolution-2.23.4-experimental-plugins.patch:

--- NEW FILE evolution-2.23.4-experimental-plugins.patch ---
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"
+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="$plugins_standard_always"
 all_plugins_standard="$plugins_standard"
 
 plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor"
-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" 
+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="$plugins_standard_always"
 all_plugins_standard="$plugins_standard"
 
 plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor"
-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


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- evolution.spec	16 Jun 2008 17:41:50 -0000	1.344
+++ evolution.spec	19 Jun 2008 13:00:31 -0000	1.345
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.23.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -77,6 +77,9 @@
 # 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
@@ -220,6 +223,7 @@
 %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
@@ -356,7 +360,6 @@
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null
@@ -383,7 +386,6 @@
 %doc AUTHORS COPYING ChangeLog NEWS README
 
 # GConf schemas:
-%{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas
 %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas
 %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas
 %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas 
@@ -506,9 +508,6 @@
 %{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
 
@@ -647,6 +646,9 @@
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Thu Jun 19 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.4-2.fc10
+- Don't ship the unfinished "Custom Header" plugin.
+
 * Mon Jun 16 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.4-1.fc10
 - Update to 2.23.4
 - Remove patches for RH bug #449925 (fixed upstream).


--- evolution-2.0.2-fix-145552.patch DELETED ---


--- evolution-2.21.92-CVE-2008-0072.patch DELETED ---