From 2003ff12b1cdff2a6e3d4430ad8a24d1df62f69e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 13 Sep 2010 13:09:44 +0200 Subject: [PATCH] Update to 2.31.92 --- .gitignore | 1 + evolution.spec | 37 +++++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index acfbdc8..ee8b9fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ evolution-2.31.5.tar.bz2 /evolution-2.31.91.tar.bz2 +/evolution-2.31.92.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 635a981..b8a81ad 100644 --- a/evolution.spec +++ b/evolution.spec @@ -4,7 +4,7 @@ %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 @@ -32,7 +32,7 @@ ### Abstract ### Name: evolution -Version: 2.31.91 +Version: 2.31.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -252,15 +252,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. @@ -614,9 +615,21 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Mon Aug 30 2010 Milan Crha - 2.31.91-1.fc15 +* Mon Sep 13 2010 Milan Crha - 2.31.92.fc15 +- Update to 2.31.92 + +* 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. diff --git a/sources b/sources index bb4a999..6e02d17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd5ccfdccf48ec8a41f48d9ac4b3e983 evolution-2.31.91.tar.bz2 +90d84ddb24daecd27bc5b1553064bc46 evolution-2.31.92.tar.bz2