diff --git a/.gitignore b/.gitignore index 434b96f..2b5efc5 100644 --- a/.gitignore +++ b/.gitignore @@ -137,3 +137,4 @@ evolution-data-server-2.31.5.tar.bz2 /evolution-data-server-3.27.92.tar.xz /evolution-data-server-3.28.0.tar.xz /evolution-data-server-3.28.1.tar.xz +/evolution-data-server-3.29.1.tar.xz diff --git a/evolution-data-server-3.28.1-angle-bracket-url.patch b/evolution-data-server-3.28.1-angle-bracket-url.patch deleted file mode 100644 index 1b1de6b..0000000 --- a/evolution-data-server-3.28.1-angle-bracket-url.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0e8f3646a182da1f9157c0426b1fa6f966ef4fcd Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Tue, 10 Apr 2018 16:05:17 +0200 -Subject: Bug 795108 - Trailing bracket not stripped when linkifying URL inside - angle brackets - ---- - src/camel/camel-url-scanner.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/camel/camel-url-scanner.c b/src/camel/camel-url-scanner.c -index e1bb62c..ed42033 100644 ---- a/src/camel/camel-url-scanner.c -+++ b/src/camel/camel-url-scanner.c -@@ -235,7 +235,7 @@ camel_url_pattern_end (const gchar *in, - * punctuation, so strip any trailing - * punctuation off. Also strip off any closing - * double-quotes. */ -- while (inptr > pos && strchr (",.:;?!-|}])\"", inptr[-1])) -+ while (inptr > pos && strchr (",.:;?!-|}])\">", inptr[-1])) - inptr--; - } - --- -cgit v0.12 - diff --git a/evolution-data-server.spec b/evolution-data-server.spec index ee7f70b..a9d6b99 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -31,17 +31,13 @@ ### Abstract ### Name: evolution-data-server -Version: 3.28.1 -Release: 2%{?dist} +Version: 3.29.1 +Release: 1%{?dist} Group: System Environment/Libraries Summary: Backend data server for Evolution License: LGPLv2+ 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-data-server/commit/?h=gnome-3-28&id=0e8f3646a182da1f9157c0426b1fa6f966ef4fcd -Patch0: evolution-data-server-3.28.1-angle-bracket-url.patch +Source: http://download.gnome.org/sources/%{name}/3.29/%{name}-%{version}.tar.xz Provides: evolution-webcal = %{version} Obsoletes: evolution-webcal < 2.24.0 @@ -56,9 +52,6 @@ Obsoletes: compat-evolution-data-server310-libcamel < 3.12 ### Patches ### -# RH bug #1395987 -#Patch01: evolution-data-server-3.23.2-krb5-fix.patch - ### Dependencies ### Requires: dconf @@ -75,7 +68,6 @@ BuildRequires: gtk-doc >= %{gtk_doc_version} BuildRequires: intltool >= %{intltool_version} BuildRequires: libdb-devel BuildRequires: perl-generators -BuildRequires: python3 BuildRequires: vala BuildRequires: vala-tools BuildRequires: sendmail @@ -176,7 +168,7 @@ The %{name}-tests package contains tests that can be used to verify the functionality of the installed %{name} package. %prep -%autosetup -p1 +%setup -q %build @@ -438,6 +430,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_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) +- Drop build dependency on python + * 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 7b19552..17cf539 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-data-server-3.28.1.tar.xz) = 76bb3e022a36b7750da3dd3d0299a0d26abc5853bbd06919c16454e59fbd788f9caaded034b26db7a1f50d91455363e2c7eaed6068520be6dec5fd500276ead3 +SHA512 (evolution-data-server-3.29.1.tar.xz) = 1ef49a26e54249055c0ecf36504565bec2a77c292bd2de0bad37b9a5f851e6cd01303229275524cc67db50b06843c14d1fa27801ea24a621c9fbf0e309c5c51b