From 5e66fe8a55eb7d893f4b6a4fdb1fb09520d2eae9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 28 May 2010 21:25:44 +0000 Subject: [PATCH] - Evolution Express supercedes Anjal. - No need to undefine GNOME_DISABLE_DEPRECATED. - Remove nntp_support flag; that got moved to E-D-S ages ago. - Remove exchange_support flag; it's all in evolution-exchange now. --- evolution.spec | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/evolution.spec b/evolution.spec index a00c383..f1a5549 100644 --- a/evolution.spec +++ b/evolution.spec @@ -23,7 +23,6 @@ %define libnotify_support 1 %define libpst_support 1 %define krb5_support 1 -%define nntp_support 1 %ifnarch s390 s390x %define nm_support 1 %else @@ -267,12 +266,6 @@ done %define krb5_flags --without-krb5 %endif -%if %{nntp_support} -%define nntp_flags --enable-nntp -%else -%define nntp_flags --disable-nntp -%endif - %define ssl_flags --enable-nss=yes --enable-smime=yes if ! pkg-config --exists nss; then @@ -285,11 +278,9 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-com %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 + %ldap_flags %pilot_flags %krb5_flags %ssl_flags \ --enable-plugins=all export tagname=CC make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing" @@ -677,6 +668,7 @@ rm -rf $RPM_BUILD_ROOT * Fri May 28 2010 Matthew Barnes - 2.31.2-2.fc14 - Evolution Express supercedes Anjal. - No need to undefine GNOME_DISABLE_DEPRECATED. +- Remove nntp_support flag; that got moved to E-D-S ages ago. - Remove exchange_support flag; it's all in evolution-exchange now. * Mon May 24 2010 Milan Crha - 2.31.2-1.fc14