From bd248c0576c07ac01d44219dab9fe92a572e5a51 Mon Sep 17 00:00:00 2001 From: Marcin Banasiak Date: Mon, 30 Oct 2017 22:18:24 +0100 Subject: [PATCH] Update to 3.26.2 - removed obsolete -destdir.patch --- evolution-destdir.patch | 21 --------------------- evolution.spec | 6 ++---- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 evolution-destdir.patch diff --git a/evolution-destdir.patch b/evolution-destdir.patch deleted file mode 100644 index c0688d7..0000000 --- a/evolution-destdir.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- evolution-3.24.1/cmake/modules/IconCache.cmake.orig 2017-04-10 10:02:00.000000000 +0200 -+++ evolution-3.24.1/cmake/modules/IconCache.cmake 2017-04-25 22:21:16.309917778 +0200 -@@ -45,9 +45,6 @@ - DESTINATION ${_destdir}/icons/${theme}/${size}/${context} - RENAME ${iconfile} - ) -- set(${_install_codevar} "${${_install_codevar}} -- COMMAND ${CMAKE_COMMAND} -E copy_if_different \"${CMAKE_CURRENT_SOURCE_DIR}/${srcfile}\" \"${_destdir}/icons/${theme}/${size}/${context}/${iconfile}\"" -- ) - endforeach(srcfile) - endmacro(process_icons) - -@@ -60,7 +57,7 @@ - - if(GTK_UPDATE_ICON_CACHE) - install(CODE -- "execute_process(${_install_code} -+ "execute_process( - COMMAND ${CMAKE_COMMAND} -E chdir . ${_update_icon_cache_cmd} - )") - endif(GTK_UPDATE_ICON_CACHE) diff --git a/evolution.spec b/evolution.spec index cc87c93..2822d51 100644 --- a/evolution.spec +++ b/evolution.spec @@ -12,19 +12,18 @@ Summary(pl.UTF-8): Klient poczty, kalendarz i książka adresowa dla GNOME Summary(pt_BR.UTF-8): Cliente de email integrado com calendário e catálogo de endereços Summary(zh_CN.UTF-8): Evolution - GNOME个人和工作组信息管理工具(包括电子邮件,日历和地址薄) Name: evolution -Version: 3.26.1 +Version: 3.26.2 Release: 1 License: GPL v2+ Group: X11/Applications/Mail Source0: http://ftp.gnome.org/pub/GNOME/sources/evolution/3.26/%{name}-%{version}.tar.xz -# Source0-md5: 678ff5a5134a6793db45faf02d15a383 +# Source0-md5: f1860def824fe9877ab7a8d4b21c7dce Source3: %{name}-addressbook.desktop Source4: %{name}-calendar.desktop Source5: %{name}-mail.desktop Source6: %{name}-tasks.desktop Patch0: %{name}-gtkdoc.patch Patch1: %{name}-highlight.patch -Patch2: %{name}-destdir.patch URL: http://wiki.gnome.org/Apps/Evolution/ BuildRequires: atk-devel BuildRequires: bison @@ -281,7 +280,6 @@ Dokumentacja API Evolution. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build export BOGOFILTER="/usr/bin/bogofilter" -- 2.44.0