Update to 3.19.91
Remove patch for GNOME bug 761883 (Fixed upstream)
This commit is contained in:
parent
8e693f88f8
commit
84ba7a4d46
1
.gitignore
vendored
1
.gitignore
vendored
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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 <mcrha@redhat.com> - 3.19.91-1
|
||||
- Update to 3.19.91
|
||||
- Remove patch for GNOME bug 761883 (Fixed upstream)
|
||||
|
||||
* Thu Feb 18 2016 Milan Crha <mcrha@redhat.com> - 3.19.90-2
|
||||
- Add patch for GNOME bug 761883 (Typo in the previous fix)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user