Compare commits

...
Sign in to create a new pull request.

8 commits

Author SHA1 Message Date
Milan Crha
091f53ce1a Update to 3.20.5 2016-08-08 12:07:37 +02:00
Milan Crha
402e71b1ce Update to 3.20.4 2016-07-11 10:23:48 +02:00
Milan Crha
705ddd7daf Update to 3.20.3 2016-06-06 11:16:34 +02:00
Milan Crha
eb57ac7b65 Update to 3.20.2 2016-05-09 10:15:44 +02:00
Milan Crha
84c98b1999 Update to 3.20.1 2016-04-11 12:36:07 +02:00
Milan Crha
f961b39bfc Update to 3.20.0 2016-03-21 11:31:10 +01:00
Milan Crha
c2db2f680f Update to 3.19.92 2016-03-14 12:34:01 +01:00
Milan Crha
525b1b0e89 Update to 3.19.91
Remove patch for GNOME bug 761883 (Fixed upstream)
2016-02-29 11:45:41 +01:00
4 changed files with 37 additions and 22 deletions

8
.gitignore vendored
View file

@ -102,3 +102,11 @@ 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
/evolution-3.19.92.tar.xz
/evolution-3.20.0.tar.xz
/evolution-3.20.1.tar.xz
/evolution-3.20.2.tar.xz
/evolution-3.20.3.tar.xz
/evolution-3.20.4.tar.xz
/evolution-3.20.5.tar.xz

View file

@ -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;

View file

@ -28,14 +28,14 @@
### Abstract ###
Name: evolution
Version: 3.19.90
Release: 2%{?dist}
Version: 3.20.5
Release: 1%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
URL: https://wiki.gnome.org/Apps/Evolution
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Source: http://download.gnome.org/sources/%{name}/3.19/%{name}-%{version}.tar.xz
Source: http://download.gnome.org/sources/%{name}/3.20/%{name}-%{version}.tar.xz
Obsoletes: anjal <= %{last_anjal_version}
Obsoletes: libgal2 <= %{last_libgal2_version}
@ -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,31 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/installed-tests
%changelog
* Mon Aug 08 2016 Milan Crha <mcrha@redhat.com> - 3.20.5-1
- Update to 3.20.5
* Mon Jul 11 2016 Milan Crha <mcrha@redhat.com> - 3.20.4-1
- Update to 3.20.4
* Mon Jun 06 2016 Milan Crha <mcrha@redhat.com> - 3.20.3-1
- Update to 3.20.3
* Mon May 09 2016 Milan Crha <mcrha@redhat.com> - 3.20.2-1
- Update to 3.20.2
* Mon Apr 11 2016 Milan Crha <mcrha@redhat.com> - 3.20.1-1
- Update to 3.20.1
* Mon Mar 21 2016 Milan Crha <mcrha@redhat.com> - 3.20.0-1
- Update to 3.20.0
* Mon Mar 14 2016 Milan Crha <mcrha@redhat.com> - 3.19.92-1
- Update to 3.19.92
* 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)

View file

@ -1 +1 @@
33bf93410cc1a4f2a3ad557fbc90b1f1 evolution-3.19.90.tar.xz
a23101c768da96477d24763b01925836 evolution-3.20.5.tar.xz