From f1643793b123b83f9635e5ec10849759d0d2aed9b9b0c5ab8f64d54b6ffb72f3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 14 Jul 2014 18:33:20 +0000 Subject: [PATCH] Accepting request 240864 from GNOME:Next Submit early.. this is not dangerous for current Factory OBS-URL: https://build.opensuse.org/request/show/240864 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=240 --- evolution-nomore-gnome-icon.patch | 24 ++++++++++++++++++++++++ evolution.changes | 12 ++++++++++++ evolution.spec | 6 ++++-- 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 evolution-nomore-gnome-icon.patch diff --git a/evolution-nomore-gnome-icon.patch b/evolution-nomore-gnome-icon.patch new file mode 100644 index 0000000..bf1b76e --- /dev/null +++ b/evolution-nomore-gnome-icon.patch @@ -0,0 +1,24 @@ +Index: evolution-3.12.3/configure.ac +=================================================================== +--- evolution-3.12.3.orig/configure.ac ++++ evolution-3.12.3/configure.ac +@@ -49,7 +49,6 @@ m4_define([gtkhtml_minimum_version], [4. + m4_define([gdk_pixbuf_minimum_version], [2.24.0]) + m4_define([gcr_minimum_version], [3.4]) + m4_define([gnome_desktop_minimum_version], [2.91.3]) +-m4_define([gnome_icon_theme_minimum_version], [2.30.2.1]) + m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92]) + m4_define([webkitgtk_minimum_version], [2.0.1]) + m4_define([libgdata_minimum_version], [0.10]) +@@ -486,11 +485,6 @@ fi + AC_CHECK_FUNCS(mkdtemp) + + dnl ************************************************** +-dnl Gnome Icon Theme +-dnl ************************************************** +-PKG_CHECK_MODULES([GIT], [gnome-icon-theme >= gnome_icon_theme_minimum_version]) +- +-dnl ************************************************** + dnl Accessibility support + dnl ************************************************** + PKG_CHECK_MODULES([A11Y], [atk]) diff --git a/evolution.changes b/evolution.changes index 6556fc3..ec12961 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Jul 13 17:17:13 UTC 2014 - dimstar@opensuse.org + +- Add evolution-nomore-gnome-icon.patch: No longer depend on + gnome-icon-theme: it has been merged and renamed to + adwaita-icon-theme. But we don't really need to know about that, + as it is GTKs responsibility. +- Switch need_autogen to 1, as above patch touches the build + system. +- Drop pkgconfig(gnome-icon-theme) BuildRequires: the above patch + made sure we don't need it anymore. + ------------------------------------------------------------------- Wed Jun 18 19:49:00 UTC 2014 - zaitor@opensuse.org diff --git a/evolution.spec b/evolution.spec index bbeb329..9f38f76 100644 --- a/evolution.spec +++ b/evolution.spec @@ -19,7 +19,7 @@ # wait for port of gtkimageview to gtk3 %define use_gtkimageview 0 -%define need_autogen 0 +%define need_autogen 1 Name: evolution # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. @@ -38,6 +38,8 @@ Url: http://wiki.gnome.org/Apps/Evolution/ Source0: http://download.gnome.org/sources/evolution/3.12/%{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 +# PATCH-FIX-UPSTREAM evolution-nomore-gnome-icon.patch dimstar@opensuse.org -- Do no longer depend on gnome-icon-theme. It's obsoleted and not needed +Patch1: evolution-nomore-gnome-icon.patch BuildRequires: bison BuildRequires: bogofilter BuildRequires: fdupes @@ -64,7 +66,6 @@ BuildRequires: pkgconfig(geocode-glib-1.0) >= 3.10 BuildRequires: pkgconfig(gio-2.0) >= 2.36.0 BuildRequires: pkgconfig(gladeui-2.0) >= 3.10.0 BuildRequires: pkgconfig(gnome-desktop-3.0) >= 2.91.3 -BuildRequires: pkgconfig(gnome-icon-theme) >= 2.30.2.1 BuildRequires: pkgconfig(gtk+-3.0) >= 3.8.0 BuildRequires: pkgconfig(gtkspell3-3.0) BuildRequires: pkgconfig(webkitgtk-3.0) >= 2.0.1 @@ -134,6 +135,7 @@ to develop applications that require these. translation-update-upstream # NEEDS REBASE #patch0 -p1 +%patch1 -p1 %build %if %{need_autogen}