From 84ba7a4d46bff9e7826f86189938cb5f75c7e9ee Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 29 Feb 2016 11:36:20 +0100 Subject: [PATCH] Update to 3.19.91 Remove patch for GNOME bug 761883 (Fixed upstream) --- .gitignore | 1 + evolution-3.19.90-gnbug761883.patch | 15 --------------- evolution.spec | 11 ++++++----- sources | 2 +- 4 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 evolution-3.19.90-gnbug761883.patch diff --git a/.gitignore b/.gitignore index e8ade2a..529c95b 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.19.3.tar.xz /evolution-3.19.4.tar.xz /evolution-3.19.90.tar.xz +/evolution-3.19.91.tar.xz diff --git a/evolution-3.19.90-gnbug761883.patch b/evolution-3.19.90-gnbug761883.patch deleted file mode 100644 index ab39dca..0000000 --- a/evolution-3.19.90-gnbug761883.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c -index b7ffba8..2abf9c2 100644 ---- a/e-util/e-html-editor-view.c -+++ b/e-util/e-html-editor-view.c -@@ -3263,8 +3263,8 @@ merge_siblings_if_necessary (WebKitDOMDocument *document, - goto signature; - repeat: - child = webkit_dom_node_get_previous_sibling (WEBKIT_DOM_NODE (element)); -- if (WEBKIT_DOM_IS_ELEMENT (prev_element)) -- prev_element = WEBKIT_DOM_ELEMENT (prev_element); -+ if (WEBKIT_DOM_IS_ELEMENT (child)) -+ prev_element = WEBKIT_DOM_ELEMENT (child); - else - goto signature; - diff --git a/evolution.spec b/evolution.spec index ec68285..858bfa7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.19.90 -Release: 2%{?dist} +Version: 3.19.91 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -46,8 +46,6 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} # RH bug # #Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch -Patch01: evolution-3.19.90-gnbug761883.patch - ## Dependencies ### Requires: gvfs @@ -210,7 +208,6 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} #%patch01 -p1 -b .doc-e-cell-renderer-color -%patch01 -p1 -b .gnbug761883 # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -530,6 +527,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Feb 29 2016 Milan Crha - 3.19.91-1 +- Update to 3.19.91 +- Remove patch for GNOME bug 761883 (Fixed upstream) + * Thu Feb 18 2016 Milan Crha - 3.19.90-2 - Add patch for GNOME bug 761883 (Typo in the previous fix) diff --git a/sources b/sources index cc749c5..01e82b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -33bf93410cc1a4f2a3ad557fbc90b1f1 evolution-3.19.90.tar.xz +05b0fa2238d44871c14a3d09aa66334d evolution-3.19.91.tar.xz