diff --git a/.gitignore b/.gitignore index a151a6e..c9b12ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,9 @@ evolution-2.31.5.tar.bz2 +evolution-2.31.6.tar.bz2 +evolution-2.31.90.tar.bz2 +/evolution-2.31.91.tar.bz2 +/evolution-2.31.92.tar.bz2 +/evolution-2.32.0.tar.bz2 +/evolution-2.32.1.tar.bz2 +/evolution-2.32.2.tar.bz2 +/evolution-2.32.3.tar.bz2 diff --git a/evolution-2.31.5-gtk-compat-crash.patch b/evolution-2.31.5-gtk-compat-crash.patch deleted file mode 100644 index bedcf0d..0000000 --- a/evolution-2.31.5-gtk-compat-crash.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up evolution-2.31.5/e-util/gtk-compat.h.gtk-compat-crash evolution-2.31.5/e-util/gtk-compat.h ---- evolution-2.31.5/e-util/gtk-compat.h.gtk-compat-crash 2010-07-11 18:26:08.000000000 -0400 -+++ evolution-2.31.5/e-util/gtk-compat.h 2010-07-22 11:51:55.076484868 -0400 -@@ -55,15 +55,15 @@ typedef enum { - #define gdk_region_get_rectangles(region, rectangles, n_rectangles) \ - G_STMT_START { \ - GdkRectangle *__rects; \ -- gint __i, __n; \ -+ gint __i, __nrects; \ - \ -- __n = cairo_region_num_rectangles (region); \ -- __rects = g_new (GdkRectangle, __n); \ -+ __nrects = cairo_region_num_rectangles (region); \ -+ __rects = g_new (GdkRectangle, __nrects); \ - \ -- for (__i = 0; __i < __n; __i++) \ -+ for (__i = 0; __i < __nrects; __i++) \ - cairo_region_get_rectangle ((region), __i, &__rects[__i]); \ - \ -- *(n_rectangles) = __n; \ -+ *(n_rectangles) = __nrects; \ - *(rectangles) = __rects; \ - } G_STMT_END - diff --git a/evolution.spec b/evolution.spec index 6870f2b..91decf4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,17 +1,17 @@ -%define dbus_glib_version 0.70 %define dbus_version 1.0 -%define glib2_version 2.22.0 +%define glib2_version 2.25.12 %define gnome_desktop_version 2.26.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 %define gtk2_version 2.20.0 -%define gtkhtml_version 3.31.2 +%define gtkhtml_version 3.31.92 %define intltool_version 0.35.5 %define libgdata_version 0.6.3 %define libgweather_version 2.25.4 +%define clutter_gtk_version 0.10 %define soup_version 2.4.0 -%define evo_base_version 3.0 +%define evo_base_version 2.32 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -21,25 +21,21 @@ %define libnotify_support 1 %define libpst_support 1 %define krb5_support 1 -%ifnarch s390 s390x %define nm_support 1 -%else -%define nm_support 0 -%endif %define evo_plugin_dir %{_libdir}/evolution/%{evo_base_version}/plugins ### Abstract ### Name: evolution -Version: 2.31.5 -Release: 2%{?dist} +Version: 2.32.3 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL 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 +Source: http://download.gnome.org/sources/%{name}/2.32/%{name}-%{version}.tar.bz2 Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -55,9 +51,6 @@ Patch12: evolution-2.9.1-im-context-reset.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch -# Fixes a crash in gtk-compat.h macros -Patch14: evolution-2.31.5-gtk-compat-crash.patch - ## Dependencies ### Requires(pre): GConf2 @@ -78,8 +71,8 @@ BuildRequires: atk-devel BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.9 BuildRequires: bison +BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} BuildRequires: dbus-devel >= %{dbus_version} -BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: desktop-file-utils BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: gettext @@ -210,7 +203,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch12 -p1 -b .im-context-reset %patch13 -p1 -b .help-contents -%patch14 -p1 -b .gtk-compat-crash mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -256,15 +248,16 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasi # Strip unneeded translations from .mo files. # This reduces the RPM size by several megabytes. -cd po -grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep -mv POTFILES.keep POTFILES.in -intltool-update --gettext-package=%{name}-%{evo_base_version} --pot -for p in *.po; do - msgmerge $p %{name}-%{evo_base_version}.pot > $p.out - msgfmt -o `basename $p .po`.gmo $p.out -done -cd - +#disabled since 2.31.91 because of a msgmerge floating point exception (see RH bug 628073) +#cd po +#grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep +#mv POTFILES.keep POTFILES.in +#intltool-update --gettext-package=%{name}-%{evo_base_version} --pot +#for p in *.po; do +# msgmerge $p %{name}-%{evo_base_version}.pot > $p.out +# msgfmt -o `basename $p .po`.gmo $p.out +#done +#cd - # Replace identical images in the help by links. # This reduces the RPM size by several megabytes. @@ -618,6 +611,52 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Apr 21 2011 Matthew Barnes - 2.32.3-1.fc14 +- Update to 2.32.3 + +* Mon Feb 07 2011 Milan Crha - 2.32.2-1.fc14 +- Update to 2.32.2 + +* Mon Nov 15 2010 Milan Crha - 2.32.1-1.fc14 +- Update to 2.32.1 +- Remove patch for Gnome bug #630700 (fixed upstream) +- Remove patch for Gnome bug #629972 (fixed upstream) + +* Wed Sep 29 2010 jkeating - 2.32.0-2.1 +- Rebuilt for gcc bug 634757 + +* Mon Sep 29 2010 Milan Crha - 2.32.0-2.fc14 +- Add patch for Gnome bug #629972 (restore from backup doesn't work) + +* Mon Sep 27 2010 Milan Crha - 2.32.0-1.fc14 +- Update to 2.32.0 +- Remove patch for Gnome bug #626066 (fixed upstream) + +* Mon Sep 27 2010 Milan Crha - 2.31.92-2.fc14 +- Add patch for Gnome bug #630700 (crash on message send) + +* Mon Sep 13 2010 Milan Crha - 2.31.92-1.fc14 +- Update to 2.31.92 +- Add patch for Gnome bug #626066 (login to NSS on demand) + +* Mon Aug 30 2010 Milan Crha - 2.31.91-1.fc14 +- Update to 2.31.91 +- Remove msgmerge calls due to a floating point exception there + +* Mon Aug 16 2010 Matthew Barnes - 2.31.90-1.fc14 +- Update to 2.31.90 + +* Fri Aug 06 2010 Matthew Barnes - 2.31.6-2.fc14 +- Fix handling of migrated signature files. + +* Tue Aug 03 2010 Matthew Barnes - 2.31.6-1.fc14 +- Update to 2.31.6 +- Drop dbus-glib requirement. +- Bump glib2 requirement to 2.25.12. +- Roll back evo_base_version to 2.32. +- Add clutter-gtk requirement (for express mode). +- Remove gtk-compat macro patch (fixed upstream). + * Thu Jul 22 2010 Matthew Barnes - 2.31.5-2.fc14 - Add patch to fix startup crash in gtk-compat macros. diff --git a/sources b/sources index 7cb2a79..b5dddfa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59a9c75d808788fa9eacce4a757b04fe evolution-2.31.5.tar.bz2 +ad68ffc12c7153b4a7cdb066521af07a evolution-2.32.3.tar.bz2