- Update to 2.23.1

- Bump evo_major to 2.22.
- Bump eds_version to 2.23.1.
- Bump glib2_version to 2.16.0.
- Bump gtkhtml_version to 3.19.1.
- Add gvfs requirement.
- Drop gnomevfs2 requirement.
- Remove patch for RH bug #164957 (obsolete).

.cvsignore

@@ -1 +1 @@
-evolution-2.22.1.tar.bz2
+evolution-2.23.1.tar.bz2

evolution.spec

@@ -1,13 +1,12 @@
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
-%define eds_version 2.21.92
+%define eds_version 2.23.1
-%define glib2_version 2.15.3
+%define glib2_version 2.16.0
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.19.91
 %define gnome_pilot_version 2.0.15
-%define gnomevfs2_version 2.4
 %define gtk2_version 2.12.0
-%define gtkhtml_version 3.17.5
+%define gtkhtml_version 3.19.1
 %define intltool_version 0.35.5
 %define last_libgal2_version 2:2.5.3-2
 %define libbonobo_version 2.20.3
@@ -17,7 +16,7 @@
 %define scrollkeeper_version 0.1.4
 %define soup_version 2.2.2
 
-%define evo_major 2.22
+%define evo_major 2.24
 
 %define exchange_support 1
 %define inline_audio_support 1
@@ -45,7 +44,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.22.1
+Version: 2.23.1
 Release: 1%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
@@ -61,28 +60,25 @@ Obsoletes: libgal2 <= %{last_libgal2_version}
 # bad hack
 Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
 
-# Fix for RH bug 164957 (was for 145552):
-Patch11: evolution-2.0.2-fix-145552.patch
-
 # Patches for conduits, based upon
 # rh-161817-attach-116019-conduit_pilot_link_updates.diff
 # (the latter patch was originally by Mark G. Adams):
-# Patch12: evolution-2.5.4-fix-conduits.patch
+# Patch11: evolution-2.5.4-fix-conduits.patch
 
 # Move .conduit files from share to lib (for the sake of multilib)
 # This patch effects other parts of evolution.spec and so is necessary
 # for a successful build.
-Patch13: evolution-2.5.4-fix-conduit-dir.patch
+Patch12: evolution-2.5.4-fix-conduit-dir.patch
 
 # Remove gnome-common macros from configure.in.
 # We do not ship gnome-common (or at least we're not supposed to).
-Patch14: evolution-2.7.1-no-gnome-common.patch
+Patch13: evolution-2.7.1-no-gnome-common.patch
 
 # RH bug #176400
-Patch15: evolution-2.9.1-im-context-reset.patch
+Patch14: evolution-2.9.1-im-context-reset.patch
 
 # RH bug #437208 / GNOME bug #518103
-Patch16: evolution-2.22.0-line-status.patch
+Patch15: evolution-2.22.0-line-status.patch
 
 ## Dependencies ###
 
@@ -114,11 +110,11 @@ BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
-BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version}
 BuildRequires: gnutls-devel
 BuildRequires: gtk-doc
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
+BuildRequires: gvfs
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
@@ -224,12 +220,11 @@ This package contains the plugin to filter junk mail using SpamAssassin.
 %prep
 %setup -q -n evolution-%{version}
 %patch10 -p1 -b .ldaphack
-%patch11 -p1 -b .fix-164957
+#patch11 -p1 -b .fix-conduits  # leave commented
-#patch12 -p1 -b .fix-conduits  # leave commented
+%patch12 -p1 -b .fix-conduit-dir
-%patch13 -p1 -b .fix-conduit-dir
+%patch13 -p1 -b .no-gnome-common
-%patch14 -p1 -b .no-gnome-common
+%patch14 -p1 -b .im-context-reset
-%patch15 -p1 -b .im-context-reset
+%patch15 -p1 -b .line-status
-%patch16 -p1 -b .line-status
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -572,10 +567,6 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/org-gnome-prefer-plain.eplug
 %{evo_plugin_dir}/liborg-gnome-prefer-plain.so
 
-%{evo_plugin_dir}/org-gnome-print-message.eplug
-%{evo_plugin_dir}/liborg-gnome-print-message.so
-%{evo_plugin_dir}/org-gnome-print-message.xml
-
 %{evo_plugin_dir}/org-gnome-save-calendar.eplug
 %{evo_plugin_dir}/liborg-gnome-save-calendar.so
 
@@ -657,6 +648,16 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Mon Apr 21 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.1-1.fc10
+- Update to 2.23.1
+- Bump evo_major to 2.22.
+- Bump eds_version to 2.23.1.
+- Bump glib2_version to 2.16.0.
+- Bump gtkhtml_version to 3.19.1.
+- Add gvfs requirement.
+- Drop gnomevfs2 requirement.
+- Remove patch for RH bug #164957 (obsolete).
+
 * Mon Apr 07 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.1-1.fc9
 - Update to 2.22.1
 - Remove patch for GNOME bug #524310 (fixed upstream).

sources

@@ -1 +1 @@
-b8eddd6e26b59b1fe6ad0ae849916836  evolution-2.22.1.tar.bz2
+cb8193627f93648975675c3c908b929b  evolution-2.23.1.tar.bz2