From e418201844b5aea239d1e38d02ef244eaf3fd459 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Oct 21 2008 19:51:19 +0000 Subject: - Update to 2.24.1 --- diff --git a/.cvsignore b/.cvsignore index f030c97..c1c64de 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.24.0.tar.bz2 +evolution-2.24.1.tar.bz2 diff --git a/evolution-1.4.4-ldap-x86_64-hack.patch b/evolution-1.4.4-ldap-x86_64-hack.patch index 44cf1c7..f37328b 100644 --- a/evolution-1.4.4-ldap-x86_64-hack.patch +++ b/evolution-1.4.4-ldap-x86_64-hack.patch @@ -1,8 +1,8 @@ -diff -up evolution-2.23.4/configure.ldaphack evolution-2.23.4/configure ---- evolution-2.23.4/configure.ldaphack 2008-06-16 07:12:17.000000000 -0400 -+++ evolution-2.23.4/configure 2008-07-18 09:08:21.000000000 -0400 -@@ -27729,7 +27729,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set} - echo $ECHO_N "(cached) $ECHO_C" >&6 +diff -up evolution-2.24.1/configure.ldaphack evolution-2.24.1/configure +--- evolution-2.24.1/configure.ldaphack 2008-10-19 23:37:55.000000000 -0400 ++++ evolution-2.24.1/configure 2008-10-21 13:16:16.000000000 -0400 +@@ -28471,7 +28471,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set} + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS" diff --git a/evolution-2.7.1-no-gnome-common.patch b/evolution-2.7.1-no-gnome-common.patch index a234736..a18ed48 100644 --- a/evolution-2.7.1-no-gnome-common.patch +++ b/evolution-2.7.1-no-gnome-common.patch @@ -1,7 +1,7 @@ -diff -up evolution-2.12.1/configure.in.no-gnome-common evolution-2.12.1/configure.in ---- evolution-2.12.1/configure.in.no-gnome-common 2007-10-15 08:30:42.000000000 +0200 -+++ evolution-2.12.1/configure.in 2007-10-15 17:54:01.000000000 +0200 -@@ -1282,9 +1282,6 @@ AC_SUBST_FILE(EVO_MARSHAL_RULE) +diff -up evolution-2.24.1/configure.in.no-gnome-common evolution-2.24.1/configure.in +--- evolution-2.24.1/configure.in.no-gnome-common 2008-10-19 23:27:24.000000000 -0400 ++++ evolution-2.24.1/configure.in 2008-10-21 13:16:54.000000000 -0400 +@@ -1332,9 +1332,6 @@ AC_SUBST_FILE(EVO_MARSHAL_RULE) dnl ************************* dnl CFLAGS and LIBS and stuff dnl ************************* @@ -11,10 +11,10 @@ diff -up evolution-2.12.1/configure.in.no-gnome-common evolution-2.12.1/configur case $CFLAGS in *-Wall*) # Turn off the annoying "comparison between signed and unsigned" -diff -up evolution-2.12.1/configure.no-gnome-common evolution-2.12.1/configure ---- evolution-2.12.1/configure.no-gnome-common 2007-10-15 17:54:01.000000000 +0200 -+++ evolution-2.12.1/configure 2007-10-15 18:47:03.000000000 +0200 -@@ -31564,137 +31564,6 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk +diff -up evolution-2.24.1/configure.no-gnome-common evolution-2.24.1/configure +--- evolution-2.24.1/configure.no-gnome-common 2008-10-21 13:16:54.000000000 -0400 ++++ evolution-2.24.1/configure 2008-10-21 13:17:55.000000000 -0400 +@@ -33230,138 +33230,6 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk @@ -50,8 +50,8 @@ diff -up evolution-2.12.1/configure.no-gnome-common evolution-2.12.1/configure - for option in -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" -- { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 --echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; } +- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 +-$as_echo_n "checking whether gcc understands $option... " >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -73,20 +73,21 @@ diff -up evolution-2.12.1/configure.no-gnome-common evolution-2.12.1/configure - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - has_option=yes -else -- echo "$as_me: failed program was:" >&5 +- $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - has_option=no @@ -94,8 +95,8 @@ diff -up evolution-2.12.1/configure.no-gnome-common evolution-2.12.1/configure - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$SAVE_CFLAGS" -- { echo "$as_me:$LINENO: result: $has_option" >&5 --echo "${ECHO_T}$has_option" >&6; } +- { $as_echo "$as_me:$LINENO: result: $has_option" >&5 +-$as_echo "$has_option" >&6; } - if test $has_option = yes; then - warning_flags="$warning_flags $option" - fi @@ -108,16 +109,16 @@ diff -up evolution-2.12.1/configure.no-gnome-common evolution-2.12.1/configure - fi - ;; - *) -- { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 --echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} +- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 +-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - CFLAGS="$realsave_CFLAGS" -- { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 --echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; } -- { echo "$as_me:$LINENO: result: $warning_flags" >&5 --echo "${ECHO_T}$warning_flags" >&6; } +- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 +-$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5 +-$as_echo "$warning_flags" >&6; } - - # Check whether --enable-iso-c was given. -if test "${enable_iso_c+set}" = set; then @@ -127,8 +128,8 @@ diff -up evolution-2.12.1/configure.no-gnome-common evolution-2.12.1/configure -fi - - -- { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 --echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; } +- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 +-$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; } - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then @@ -142,8 +143,8 @@ diff -up evolution-2.12.1/configure.no-gnome-common evolution-2.12.1/configure - esac - fi - fi -- { echo "$as_me:$LINENO: result: $complCFLAGS" >&5 --echo "${ECHO_T}$complCFLAGS" >&6; } +- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5 +-$as_echo "$complCFLAGS" >&6; } - - WARN_CFLAGS="$warning_flags $complCFLAGS" - diff --git a/evolution.spec b/evolution.spec index 8cac490..6bb2f4c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.24.0 -Release: 3%{?dist} +Version: 2.24.1 +Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -696,6 +696,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Oct 21 2008 Matthew Barnes - 2.24.1-1.fc10 +- Update to 2.24.1 + * Wed Oct 8 2008 Matthias Clasen - 2.24.0-3 - Save space in the -help package by not shipping multiple copies of each screenshot diff --git a/sources b/sources index 473f095..6892bd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -50784255d9da0987032c806fc0226b10 evolution-2.24.0.tar.bz2 +d770bfddf8a79b841c515f756cb5af4b evolution-2.24.1.tar.bz2