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
This commit is contained in:
Bjørn Lie 2016-04-15 09:37:28 +00:00 committed by Git OBS Bridge
parent 09d1fa3457
commit fe6d76a2f7
3 changed files with 6 additions and 1314 deletions

File diff suppressed because it is too large Load Diff

View File

@ -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 Mon Apr 11 18:18:49 UTC 2016 - zaitor@opensuse.org

View File

@ -36,8 +36,6 @@ Group: Productivity/Networking/Email/Clients
# NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859 # NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859
Url: http://wiki.gnome.org/Apps/Evolution/ Url: http://wiki.gnome.org/Apps/Evolution/
Source0: http://download.gnome.org/sources/evolution/3.20/%{name}-%{version}.tar.xz 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 # The icon we rely on is from adwaita-icon-theme
BuildRequires: adwaita-icon-theme BuildRequires: adwaita-icon-theme
BuildRequires: bison BuildRequires: bison
@ -164,8 +162,6 @@ to develop applications that require these.
%prep %prep
%setup -q %setup -q
translation-update-upstream translation-update-upstream
# NEEDS REBASE
#patch0 -p1
%build %build
%if %{need_autogen} %if %{need_autogen}