pool/evolution
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 240864 from GNOME:Next

Browse Source 
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
This commit is contained in:
Dominique Leuenberger 2014-07-14 18:33:20 +00:00 committed by Git OBS Bridge
parent 264d53c254
commit f1643793b1
3 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
evolution-nomore-gnome-icon.patch Normal file
View File

@ -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])

12
evolution.changes
View File

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

6
evolution.spec
View File

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