rpms/evolution/devel .cvsignore, 1.100, 1.101 evolution.spec, 1.359, 1.360 sources, 1.100, 1.101 evolution-2.23.4-experimental-plugins.patch, 1.3, NONE

[Matthew Barnes]

Author: mbarnes

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

Modified Files:
	.cvsignore evolution.spec sources 
Removed Files:
	evolution-2.23.4-experimental-plugins.patch 
Log Message:

* Mon Nov 03 2008 Matthew Barnes <mbarnes at 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.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- .cvsignore	21 Oct 2008 19:51:18 -0000	1.100
+++ .cvsignore	3 Nov 2008 21:37:11 -0000	1.101
@@ -1 +1 @@
-evolution-2.24.1.tar.bz2
+evolution-2.25.1.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- evolution.spec	21 Oct 2008 20:36:36 -0000	1.359
+++ evolution.spec	3 Nov 2008 21:37:11 -0000	1.360
@@ -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
-Release: 2%{?dist}
+Version: 2.25.1
+Release: 1%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -77,9 +77,6 @@
 # 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 @@
 %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_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 @@
 %{_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 @@
 %{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 @@
 %{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 @@
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Mon Nov 03 2008 Matthew Barnes <mbarnes at 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 at redhat.com> - 2.24.1-2.fc10
 - Bump eds_version to 2.24.1 (unfortunately).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- sources	21 Oct 2008 19:51:19 -0000	1.100
+++ sources	3 Nov 2008 21:37:11 -0000	1.101
@@ -1 +1 @@
-d770bfddf8a79b841c515f756cb5af4b  evolution-2.24.1.tar.bz2
+c9623df3e930e5d775527bb8851183bc  evolution-2.25.1.tar.bz2


--- evolution-2.23.4-experimental-plugins.patch DELETED ---