Accepting request 390158 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/390158
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=180

evolution-3.20.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6bd0cc0c077363a29026a5194062d981d0b0aa9ffea9e7ffcec1f1fdbe9b502e
-size 12114388

evolution-3.20.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:029567e20fa62263c5fcd2e7f3a0dff96364b647cf9d36a5b99a3abe3b0027d3
+size 12108464

evolution.changes

@@ -1,3 +1,56 @@
+-------------------------------------------------------------------
+Wed Apr 13 22:37:39 UTC 2016 - mgorse@suse.com
+
+- Drop evolution-migrate-kmail-kcontact.patch: merged upstream
+  (bgo#731502).
+
+-------------------------------------------------------------------
+Mon Apr 11 18:18:49 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.20.1:
+  + [EAttachmentTree/IconView]: Setup widgets in 'constructed'
+    handler.
+  + Remove unneeded runtime warning from
+    e-day-view.c::cancel_editing().
+  + Vertically center table header text.
+  + Make some settings changes in mail composer permanent.
+  + Add missing closing double quote, thus webview-print.css is
+    actually used.
+  + Reposition ECalendar children on timeout, not inside
+    size-allocate handler.
+  + Cannot change order list to unordered for the first time.
+  + Inline images in drafts are not displayed in GMail.
+  + EHTMLEditorView:
+    - Remove signature from Thunderbird if presented.
+    - Correct the new lines handling in quoted content.
+    - Avoid variables with the same name in one scope.
+    - Don't replace various whitespaces with non-breaking spaces
+      when inserting into PRE element.
+    - Busy loop after pasting two links after each other in the
+      quoted content.
+   + EHTMLEditorSelection:
+     - Selection could be saved wrong in quoted content.
+     - Anchors could be wrongly wrapped in quoted content.
+     - Ask for a parent node of the right node.
+   + Bugs fixed: bgo#736808, bgo#763796, bgo#764062, bgo#764234,
+     bgo#764172, bgo#763723, bgo#764426, bgo#764428, bgo#240130,
+     bgo#764542, bgo#762785, bgo#758878.
+   + Updated translations.
+
+-------------------------------------------------------------------
+Thu Mar 31 17:25:28 UTC 2016 - badshah400@gmail.com
+
+- Do not pass the option "-N Evolution" to
+  %suse_update_desktop_file for evolution.desktop: this has the
+  ugly side-effect of changing every Name entry in the .desktop
+  file, including those (new to v3.20.0) for desktop actions,
+  to Evolution which messes up the desktop item.
+- Do not pass the option "-D evolution" to
+  %suse_update_desktop_file for evolution.desktop: the specified
+  docpath no longer exists; this prevents the following warning
+  "suse_update_desktop_file: DocPath target evolution for does not
+  exist" during the %install stage.
+
 -------------------------------------------------------------------
 Mon Mar 21 12:33:40 UTC 2016 - dimstar@opensuse.org
 

evolution.spec

@@ -24,7 +24,7 @@
 Name:           evolution
 # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
 %define evolution_base_version 3.20
-Version:        3.20.0
+Version:        3.20.1
 Release:        0
 # _version needs to be %{version} stripped to major.minor.micro only...
 %define _version %(echo %{version} | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')
@@ -36,8 +36,6 @@ Group:          Productivity/Networking/Email/Clients
 # NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859
 Url:            http://wiki.gnome.org/Apps/Evolution/
 Source0:        http://download.gnome.org/sources/evolution/3.20/%{name}-%{version}.tar.xz
-# PATCH-NEEDS-REBASE evolution-migrate-kmail-kcontact.patch fate#316619 dliang@suse.com -- Migrate Kmail/Kcontact into evolution (WAS:PATCH-FEATURE-OPENSUSE)
-Patch0:         evolution-migrate-kmail-kcontact.patch
 # The icon we rely on is from adwaita-icon-theme
 BuildRequires:  adwaita-icon-theme
 BuildRequires:  bison
@@ -164,8 +162,6 @@ to develop applications that require these.
 %prep
 %setup -q
 translation-update-upstream
-# NEEDS REBASE
-#patch0 -p1
 
 %build
 %if %{need_autogen}
@@ -193,7 +189,7 @@ make %{?_smp_flags} V=1
 find %{buildroot} -name '*.la' -type f -delete -print
 # Office is okay upstream, but we want the menu item to appear in Internet
 grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.desktop
-%suse_update_desktop_file -r -G "Mail and Calendar" -N "Evolution" -D "evolution" evolution GNOME GTK Network Email Calendar ContactManagement
+%suse_update_desktop_file -r -G "Mail and Calendar" evolution GNOME GTK Network Email Calendar ContactManagement
 %suse_update_desktop_file evolution-alarm-notify
 %find_lang evolution-%evolution_base_version %{?no_lang_C}
 %find_lang evolution %{?no_lang_C} evolution-%evolution_base_version.lang