diff --git a/.gitignore b/.gitignore index aef9f18..4cae27d 100644 --- a/.gitignore +++ b/.gitignore @@ -145,3 +145,4 @@ evolution-data-server-2.31.5.tar.bz2 /evolution-data-server-3.29.91.tar.xz /evolution-data-server-3.29.92.tar.xz /evolution-data-server-3.30.0.tar.xz +/evolution-data-server-3.30.1.tar.xz diff --git a/evolution-data-server-3.30.0-evo-issue-86.patch b/evolution-data-server-3.30.0-evo-issue-86.patch deleted file mode 100644 index 5a4e797..0000000 --- a/evolution-data-server-3.30.0-evo-issue-86.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/src/camel/camel-mime-filter-tohtml.c b/src/camel/camel-mime-filter-tohtml.c -index 07024aa1a..df6283655 100644 ---- a/src/camel/camel-mime-filter-tohtml.c -+++ b/src/camel/camel-mime-filter-tohtml.c -@@ -303,6 +303,7 @@ html_convert (CamelMimeFilter *mime_filter, - outend = mime_filter->outbuf + mime_filter->outsize; - - if (priv->flags & CAMEL_MIME_FILTER_TOHTML_PRE && !priv->pre_open) { -+ outptr = check_size (mime_filter, outptr, &outend, 6); - outptr = g_stpcpy (outptr, "
");
- 		priv->pre_open = TRUE;
- 	}
-@@ -339,13 +340,13 @@ html_convert (CamelMimeFilter *mime_filter,
- 
- 			depth = citation_depth (start, inend, &skip);
- 			while (priv->blockquote_depth < depth) {
--				outptr = check_size (mime_filter, outptr, &outend, 30);
--				outptr = g_stpcpy (outptr, "
\n"); -+ outptr = check_size (mime_filter, outptr, &outend, 25); -+ outptr = g_stpcpy (outptr, "
"); - priv->blockquote_depth++; - } - while (priv->blockquote_depth > depth) { -- outptr = check_size (mime_filter, outptr, &outend, 15); -- outptr = g_stpcpy (outptr, "
\n"); -+ outptr = check_size (mime_filter, outptr, &outend, 14); -+ outptr = g_stpcpy (outptr, "
"); - priv->blockquote_depth--; - } - #if FOOLISHLY_UNMUNGE_FROM -@@ -463,14 +464,14 @@ html_convert (CamelMimeFilter *mime_filter, - outptr, &outend); - - while (priv->blockquote_depth > 0) { -- outptr = check_size (mime_filter, outptr, &outend, 15); -+ outptr = check_size (mime_filter, outptr, &outend, 14); - outptr = g_stpcpy (outptr, ""); - priv->blockquote_depth--; - } - - if (priv->pre_open) { - /* close the pre-tag */ -- outptr = check_size (mime_filter, outptr, &outend, 10); -+ outptr = check_size (mime_filter, outptr, &outend, 7); - outptr = g_stpcpy (outptr, "
"); - priv->pre_open = FALSE; - } diff --git a/evolution-data-server.spec b/evolution-data-server.spec index df6ac7e..21e9839 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -32,7 +32,7 @@ ### Abstract ### Name: evolution-data-server -Version: 3.30.0 +Version: 3.30.1 Release: 1%{?dist} Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -41,7 +41,6 @@ URL: https://wiki.gnome.org/Apps/Evolution Source: http://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}.tar.xz ### Patches ### -Patch01: evolution-data-server-3.30.0-evo-issue-86.patch Provides: evolution-webcal = %{version} Obsoletes: evolution-webcal < 2.24.0 @@ -173,8 +172,6 @@ the functionality of the installed %{name} package. %prep %setup -q -%patch01 -p1 -b .evo-issue-86 - %build mkdir -p _build @@ -443,6 +440,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/installed-tests %changelog +* Mon Sep 24 2018 Milan Crha - 3.30.1-1 +- Update to 3.30.1 +- Remove patch for GNOME Evolution issue #86 (fixed upstream) + * Mon Sep 03 2018 Milan Crha - 3.30.0-1 - Update to 3.30.0 - Add patch for GNOME Evolution issue #86 (Quoting of plain text mail into HTML mode mangles deeper levels) diff --git a/sources b/sources index e9cf946..c253581 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-data-server-3.30.0.tar.xz) = 1a14b55b66f22c9134736494f8b94ee1ac5c64613122441ca96f3c031848d095073c68fd7b9c2f1566a6a355dd474883dfc372e1d6598b99644e7e1c7bd184c9 +SHA512 (evolution-data-server-3.30.1.tar.xz) = be7b6498542896b9891b3458b8d8e05e004199821ebf822bf50e2753954de0e499af9ad14cfe6eb082fc4edcdb31b16991dd4e745e20f74b1fe34661483fe8bd