diff --git a/.gitignore b/.gitignore index d1d52db..b3d9e1c 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.9.2.tar.xz /evolution-3.9.3.tar.xz /evolution-3.9.4.tar.xz +/evolution-3.9.5.tar.xz diff --git a/evolution-3.9.4-stack-protector-strong-crash.patch b/evolution-3.9.4-stack-protector-strong-crash.patch deleted file mode 100644 index b510594..0000000 --- a/evolution-3.9.4-stack-protector-strong-crash.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up evolution-3.9.4/modules/mail-config/e-mail-config-smtp-backend.c.stack-protector-strong-crash evolution-3.9.4/modules/mail-config/e-mail-config-smtp-backend.c ---- evolution-3.9.4/modules/mail-config/e-mail-config-smtp-backend.c.stack-protector-strong-crash 2013-07-07 11:19:47.000000000 -0400 -+++ evolution-3.9.4/modules/mail-config/e-mail-config-smtp-backend.c 2013-07-17 12:13:48.981736397 -0400 -@@ -238,8 +238,8 @@ mail_config_smtp_backend_insert_widgets - priv->user_entry = widget; /* do not reference */ - gtk_widget_show (widget); - -- port = 0; -- g_object_get (G_OBJECT (settings), "port", &port, NULL); -+ port = camel_network_settings_get_port ( -+ CAMEL_NETWORK_SETTINGS (settings)); - - g_object_bind_property ( - settings, "host", diff --git a/evolution.spec b/evolution.spec index 5137253..1df9222 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,8 +30,8 @@ ### Abstract ### Name: evolution -Version: 3.9.4 -Release: 3%{?dist} +Version: 3.9.5 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -51,9 +51,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch -# GNOME bug #703991 -Patch03: evolution-3.9.4-stack-protector-strong-crash.patch - ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -196,7 +193,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents -%patch03 -p1 -b .stack-protector-strong-crash mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -522,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jul 29 2013 Milan Crha - 3.9.5-1 +- Update to 3.9.5 + * Wed Jul 17 2013 Matthew Barnes - 3.9.4-3 - Work around a crash caught by -fstack-protector-strong. diff --git a/sources b/sources index de423f3..45ef28e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b54aa0a49823eb2b6ad28b60a5b9fb22 evolution-3.9.4.tar.xz +f13c061585c9790d80a02f7b054c1aa1 evolution-3.9.5.tar.xz