- Update to 2.10.1
- Remove patch for CVE-2007-1002 (fixed upstream). - Remove patch for RH bug #231767 (fixed upstream). - Remove patch for RH bug #235056 (fixed upstream). - Remove patch for GNOME bug #352713 (fixed upstream).
This commit is contained in:
Matthew Barnes
parent
923169d873
commit
55b170f410
@ -1 +1 @@
|
||||
evolution-2.10.0.tar.bz2
|
||||
evolution-2.10.1.tar.bz2
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
--- evolution-2.9.5/configure.no-gnome-common 2007-01-21 22:00:01.000000000 -0500
|
||||
+++ evolution-2.9.5/configure 2007-01-21 22:00:53.000000000 -0500
|
||||
@@ -30764,141 +30764,6 @@
|
||||
--- evolution-2.10.1/configure.no-gnome-common 2007-04-09 12:32:23.000000000 -0400
|
||||
+++ evolution-2.10.1/configure 2007-04-09 12:33:02.000000000 -0400
|
||||
@@ -33161,154 +33161,6 @@
|
||||
|
||||
|
||||
|
||||
- # Check whether --enable-compile-warnings or --disable-compile-warnings was given.
|
||||
- # Check whether --enable-compile-warnings was given.
|
||||
-if test "${enable_compile_warnings+set}" = set; then
|
||||
- enableval="$enable_compile_warnings"
|
||||
-
|
||||
- enableval=$enable_compile_warnings;
|
||||
-else
|
||||
- enable_compile_warnings="yes"
|
||||
-fi;
|
||||
-fi
|
||||
-
|
||||
-
|
||||
- warnCFLAGS=
|
||||
- if test "x$GCC" != xyes; then
|
||||
@ -36,8 +36,8 @@
|
||||
- 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
|
||||
- { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
|
||||
-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
|
||||
- cat >conftest.$ac_ext <<_ACEOF
|
||||
-/* confdefs.h. */
|
||||
-_ACEOF
|
||||
@ -54,24 +54,36 @@
|
||||
-}
|
||||
-_ACEOF
|
||||
-rm -f conftest.$ac_objext
|
||||
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
- (eval $ac_compile) 2>conftest.er1
|
||||
-if { (ac_try="$ac_compile"
|
||||
-case "(($ac_try" in
|
||||
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
- *) ac_try_echo=$ac_try;;
|
||||
-esac
|
||||
-eval "echo \"\$as_me:$LINENO: $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
|
||||
- (exit $ac_status); } &&
|
||||
- { ac_try='test -z "$ac_c_werror_flag"
|
||||
- || test ! -s conftest.err'
|
||||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
- (eval $ac_try) 2>&5
|
||||
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
- { (case "(($ac_try" in
|
||||
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
- *) ac_try_echo=$ac_try;;
|
||||
-esac
|
||||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
- (eval "$ac_try") 2>&5
|
||||
- ac_status=$?
|
||||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
- (exit $ac_status); }; } &&
|
||||
- { ac_try='test -s conftest.$ac_objext'
|
||||
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
- (eval $ac_try) 2>&5
|
||||
- { (case "(($ac_try" in
|
||||
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
- *) ac_try_echo=$ac_try;;
|
||||
-esac
|
||||
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
- (eval "$ac_try") 2>&5
|
||||
- ac_status=$?
|
||||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
- (exit $ac_status); }; }; then
|
||||
@ -80,12 +92,13 @@
|
||||
- echo "$as_me: failed program was:" >&5
|
||||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||||
-
|
||||
-has_option=no
|
||||
- has_option=no
|
||||
-fi
|
||||
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
-
|
||||
-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
|
||||
- { echo "$as_me:$LINENO: result: $has_option" >&5
|
||||
-echo "${ECHO_T}$has_option" >&6; }
|
||||
- if test $has_option = yes; then
|
||||
- warning_flags="$warning_flags $option"
|
||||
- fi
|
||||
@ -104,21 +117,21 @@
|
||||
- ;;
|
||||
- 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
|
||||
- { 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; }
|
||||
-
|
||||
- # Check whether --enable-iso-c or --disable-iso-c was given.
|
||||
- # Check whether --enable-iso-c was given.
|
||||
-if test "${enable_iso_c+set}" = set; then
|
||||
- enableval="$enable_iso_c"
|
||||
-
|
||||
- enableval=$enable_iso_c;
|
||||
-else
|
||||
- enable_iso_c=no
|
||||
-fi;
|
||||
-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
|
||||
-
|
||||
- { 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; }
|
||||
- complCFLAGS=
|
||||
- if test "x$enable_iso_c" != "xno"; then
|
||||
- if test "x$GCC" = "xyes"; then
|
||||
@ -132,8 +145,8 @@
|
||||
- esac
|
||||
- fi
|
||||
- fi
|
||||
- echo "$as_me:$LINENO: result: $complCFLAGS" >&5
|
||||
-echo "${ECHO_T}$complCFLAGS" >&6
|
||||
- { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
|
||||
-echo "${ECHO_T}$complCFLAGS" >&6; }
|
||||
-
|
||||
- WARN_CFLAGS="$warning_flags $complCFLAGS"
|
||||
-
|
||||
@ -142,9 +155,9 @@
|
||||
case $CFLAGS in
|
||||
*-Wall*)
|
||||
# Turn off the annoying "comparison between signed and unsigned"
|
||||
--- evolution-2.9.5/configure.in.no-gnome-common 2007-01-08 11:54:43.000000000 -0500
|
||||
+++ evolution-2.9.5/configure.in 2007-01-21 21:57:28.000000000 -0500
|
||||
@@ -1133,9 +1133,6 @@
|
||||
--- evolution-2.10.1/configure.in.no-gnome-common 2007-04-09 09:11:47.000000000 -0400
|
||||
+++ evolution-2.10.1/configure.in 2007-04-09 12:32:23.000000000 -0400
|
||||
@@ -1136,9 +1136,6 @@
|
||||
dnl *************************
|
||||
dnl CFLAGS and LIBS and stuff
|
||||
dnl *************************
|
||||
|
||||
@ -46,8 +46,8 @@
|
||||
### Abstract ###
|
||||
|
||||
Name: evolution
|
||||
Version: 2.10.0
|
||||
Release: 10%{?dist}
|
||||
Version: 2.10.1
|
||||
Release: 1%{?dist}
|
||||
License: GPL
|
||||
Group: Applications/Productivity
|
||||
Summary: GNOME's next-generation groupware suite
|
||||
@ -158,18 +158,6 @@ Patch46: evolution-2.10.0-use-glib-i18n.patch
|
||||
# GNOME bug #418971
|
||||
Patch47: evolution-2.10.0-drop-old-glib-support.patch
|
||||
|
||||
# CVE-2007-1002
|
||||
Patch48: evolution-2.10.0-CVE-2007-1002.patch
|
||||
|
||||
# RH bug #231767 / GNOME bug #400241
|
||||
Patch49: evolution-2.10.0-let-mail-notification-build.patch
|
||||
|
||||
# RH bug #235056
|
||||
Patch50: evolution-2.10.0-plugins-require-libxml2.patch
|
||||
|
||||
# GNOME bug #352713
|
||||
Patch51: evolution-2.10.0-bold-folders.patch
|
||||
|
||||
## Dependencies ###
|
||||
|
||||
Requires(post): GConf2
|
||||
@ -322,10 +310,6 @@ Development files needed for building things which link against evolution.
|
||||
%patch45 -p1 -b .shell-main-cleanups
|
||||
%patch46 -p1 -b .use-glib-i18n
|
||||
%patch47 -p1 -b .drop-old-glib-support
|
||||
%patch48 -p1 -b .CVE-2007-1002
|
||||
%patch49 -p1 -b .let-mail-notification-build
|
||||
%patch50 -p1 -b .plugins-require-libxml2
|
||||
%patch51 -p1 -b .bold-folders
|
||||
|
||||
mkdir -p krb5-fakeprefix/include
|
||||
mkdir -p krb5-fakeprefix/lib
|
||||
@ -742,6 +726,13 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/evolution/%{evo_major}/libmenus.so
|
||||
|
||||
%changelog
|
||||
* Mon Apr 09 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-1.fc7
|
||||
- Update to 2.10.1
|
||||
- Remove patch for CVE-2007-1002 (fixed upstream).
|
||||
- Remove patch for RH bug #231767 (fixed upstream).
|
||||
- Remove patch for RH bug #235056 (fixed upstream).
|
||||
- Remove patch for GNOME bug #352713 (fixed upstream).
|
||||
|
||||
* Wed Apr 04 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-10.fc7
|
||||
- Add patch for GNOME bug #352713 (improve folder tree updates).
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user