- Evolution Express supercedes Anjal.

- No need to undefine GNOME_DISABLE_DEPRECATED.
- Remove exchange_support flag; it's all in evolution-exchange now.

evolution.spec

@@ -8,7 +8,6 @@
 %define gtk2_version 2.20.0
 %define gtkhtml_version 3.31.2
 %define intltool_version 0.35.5
-%define last_libgal2_version 2:2.5.3-2
 %define libgdata_version 0.6.3
 %define libgweather_version 2.25.4
 %define pilot_link_version 2:0.12.1
@@ -16,7 +15,9 @@
 
 %define evo_base_version 3.0
 
-%define exchange_support 1
+%define last_anjal_version 0.3.2-3
+%define last_libgal2_version 2:2.5.3-2
+
 %define inline_audio_support 1
 %define ldap_support 1
 %define libnotify_support 1
@@ -40,7 +41,7 @@
 
 Name: evolution
 Version: 2.31.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -48,6 +49,7 @@ URL: http://projects.gnome.org/evolution/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Source: http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2
 
+Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
 
 ### Patches ###
@@ -278,28 +280,19 @@ if ! pkg-config --exists nss; then
   exit 1
 fi
 
-%if %{exchange_support}
-%define exchange_flags --enable-exchange
-%else
-%define exchange_flags --disable-exchange
-%endif
-
 CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
 CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare"; export CFLAGS
 
-# Regenerate mail/Makefile.in (this is temporary).
-# autoreconf --force
-
 %configure \
 	--enable-gtk-doc \
 	--enable-ipv6 \
 	--with-sub-version=" (%{version}-%{release})" \
 	--with-kde-applnk-path=no \
 	%ldap_flags %pilot_flags %krb5_flags \
-	%nntp_flags %ssl_flags %exchange_flags \
+	%nntp_flags %ssl_flags
 	--enable-plugins=all
 export tagname=CC
-make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED -fno-strict-aliasing"
+make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing"
 
 # Strip unneeded translations from .mo files.
 # This reduces the RPM size by several megabytes.
@@ -681,6 +674,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri May 28 2010 Matthew Barnes <mbarnes@redhat.com> - 2.31.2-2.fc14
+- Evolution Express supercedes Anjal.
+- No need to undefine GNOME_DISABLE_DEPRECATED.
+- Remove exchange_support flag; it's all in evolution-exchange now.
+
 * Mon May 24 2010 Milan Crha <mcrha@redhat.com> - 2.31.2-1.fc14
 - Update to 2.31.2
 - Bump gtkhtml3 requirement to 3.31.2