Accepting request 389678 from GNOME:Next

1

OBS-URL: https://build.opensuse.org/request/show/389678
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=295

evolution.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
 

evolution.spec

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