Accepting request 244488 from GNOME:Next

Updaye to 3.12.5

OBS-URL: https://build.opensuse.org/request/show/244488
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=243
This commit is contained in:
Dominique Leuenberger 2014-08-13 21:29:03 +00:00 committed by Git OBS Bridge
parent d17cadb481
commit 31dc6b8736
5 changed files with 32 additions and 32 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e52f46038a859179a2a20c13d2bf9ad6ea240f03ec9e54661f813b0582905a2
size 12135060

3
evolution-3.12.5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:524fb582db58fe22d79aa51e673e5fc85bcdd7d389e29c117664aed57cc4c123
size 12138404

View File

@ -1,24 +0,0 @@
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])

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Mon Aug 11 08:47:15 UTC 2014 - zaitor@opensuse.org
- Update to version 3.12.5:
+ Images in contact preview are not shown with webkitgtk3 2.4.x.
+ Add missing chain-up-s to parent's constructed() method.
+ Always use selected color for selected region in EDayView.
+ e_day_view_show_popup_menu: Avoid runtime warning from
tooltip_get_view_event.
+ Calendar View: Use smaller icons in the Search bar.
+ e_mail_folder_uri_build: Encode special characters in folder
names.
+ e_client_cache_get_client: Fix a memory leak.
+ Bugs fixed: bgo#732892, bgo#733295, bgo#733917.
+ Updated translations.
- Drop evolution-nomore-gnome-icon.patch: Fixed upstream.
- Set define need_autogen to 0, as we are not applying any patches
at the moment.
-------------------------------------------------------------------
Wed Jul 23 19:48:05 UTC 2014 - dimstar@opensuse.org
- Update evolution-nomore-gnome-icon.patch to match what upstream
does in git.
- Add pkgconfig(adwaita-icon-theme) BuildRequires: upstream wants
to check for the presence of the theme.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 16 07:33:58 UTC 2014 - dimstar@opensuse.org Wed Jul 16 07:33:58 UTC 2014 - dimstar@opensuse.org

View File

@ -19,12 +19,12 @@
# wait for port of gtkimageview to gtk3 # wait for port of gtkimageview to gtk3
%define use_gtkimageview 0 %define use_gtkimageview 0
%define need_autogen 1 %define need_autogen 0
Name: evolution Name: evolution
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
%define evolution_base_version 3.12 %define evolution_base_version 3.12
Version: 3.12.4 Version: 3.12.5
Release: 0 Release: 0
# _version needs to be %{version} stripped to major.minor.micro only... # _version needs to be %{version} stripped to major.minor.micro only...
%define _version %(echo %{version} | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+') %define _version %(echo %{version} | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')
@ -38,8 +38,6 @@ Url: http://wiki.gnome.org/Apps/Evolution/
Source0: http://download.gnome.org/sources/evolution/3.12/%{name}-%{version}.tar.xz 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) # 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 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: bison
BuildRequires: bogofilter BuildRequires: bogofilter
BuildRequires: fdupes BuildRequires: fdupes
@ -135,7 +133,6 @@ to develop applications that require these.
translation-update-upstream translation-update-upstream
# NEEDS REBASE # NEEDS REBASE
#patch0 -p1 #patch0 -p1
%patch1 -p1
%build %build
%if %{need_autogen} %if %{need_autogen}