diff --git a/.gitignore b/.gitignore index 523e09a..4db1dce 100644 --- a/.gitignore +++ b/.gitignore @@ -144,3 +144,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.27.92.tar.xz /evolution-3.28.0.tar.xz /evolution-3.28.1.tar.xz +/evolution-3.29.1.tar.xz diff --git a/evolution-3.28.1-angle-bracket-url.patch b/evolution-3.28.1-angle-bracket-url.patch deleted file mode 100644 index 2a402ff..0000000 --- a/evolution-3.28.1-angle-bracket-url.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8df33a2da490f1201da01f2d959b515e3d98ae9f Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Tue, 10 Apr 2018 16:08:28 +0200 -Subject: Bug 795108 - Trailing bracket not stripped when linkifying URL inside - angle brackets - ---- - src/modules/webkit-editor/web-extension/e-editor-dom-functions.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h -index 071c48e..4191d2c 100644 ---- a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h -+++ b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h -@@ -31,7 +31,7 @@ - #define URL_PATTERN "((?:(?:(?:" URL_PROTOCOLS ")\\:\\/\\/)|(?:www\\.|ftp\\.))[^\\s\\/\\$\\.\\?#].[^\\s]*+)" - #define URL_PATTERN_SPACE URL_PATTERN "\\s$" - /* Taken from camel-url-scanner.c */ --#define URL_INVALID_TRAILING_CHARS ",.:;?!-|}])\"" -+#define URL_INVALID_TRAILING_CHARS ",.:;?!-|}])\">" - - /* http://www.w3.org/TR/html5/forms.html#valid-e-mail-address */ - #define E_MAIL_PATTERN \ --- -cgit v0.12 - diff --git a/evolution.spec b/evolution.spec index d9389c6..1746b42 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,17 +27,13 @@ ### Abstract ### Name: evolution -Version: 3.28.1 -Release: 2%{?dist} +Version: 3.29.1 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution -Source: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz - -# Backport upstream fix for stripping closing > from URLs when linkifying -# https://git.gnome.org/browse/evolution/commit/?id=8df33a2da490f1201da01f2d959b515e3d98ae9f -Patch0: evolution-3.28.1-angle-bracket-url.patch +Source: http://download.gnome.org/sources/%{name}/3.29/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -48,9 +44,6 @@ Obsoletes: evolution-perl < %{last_evo_perl_version} ### Patches ### -# RH bug # -#Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch - ## Dependencies ### Requires: evolution-data-server >= %{eds_version} @@ -215,7 +208,7 @@ The %{name}-tests package contains tests that can be used to verify the functionality of the installed %{name} package. %prep -%autosetup -p1 -n evolution-%{version} +%setup -q -n evolution-%{version} # Remove the welcome email from Novell for inbox in src/mail/default/*/Inbox; do @@ -508,6 +501,10 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Apr 16 2018 Milan Crha - 3.29.1-1 +- Update to 3.29.1 +- Remove fix to strip closing > from URLs when linkifying (BGO#795108) (Fixed upstream) + * Tue Apr 10 2018 Adam Williamson - 3.28.1-2 - Backport fix to strip closing > from URLs when linkifying (BGO#795108) diff --git a/sources b/sources index 052d166..7f4737b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.28.1.tar.xz) = 8567d5c8563a30b006f9f7dae1c1b3ce76b517526730b1cef1f367f9dccf66e0dd6adc50281331839c04be344be1d60343418ad584c21219659fa547cb9656ea +SHA512 (evolution-3.29.1.tar.xz) = 917b6aa6854e7ae2d157316821e436fedfcf7ab266e19fd9264ee7d315801214e94a98edeff8f2298c0fbd257e99b91fc05e74dcab453c5d017719a8dee43dc9