Accepting request 241559 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/241559
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=157

evolution-3.12.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:980988cf3d1f537102f4a3143a2c251ac812666b8f0936afd6bdde0fe5a96fea
-size 12123820

evolution-3.12.4.tar.xz

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

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

evolution.changes

@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Wed Jul 16 07:33:58 UTC 2014 - dimstar@opensuse.org
+
+- Update to version 3.12.4:
+  + Fix possible crash after migrate of mbox to maildir.
+  + EClientSelector: Do not check connection for empty or
+    "localhost" host.
+  + Fix memory leaks when generating message list.
+  + store_info_insert_folder_info: Use g_hash_table_replace() to
+    avoid use-after-free.
+  + Reply to selection in text-highlight part loses white-spaces.
+  + Replace GtkStyle usages with GtkStyleContext.
+  + SMTP part of a new mail account dialog doesn't update UI
+    properly.
+  + Disconnect the store when connected it on send from an Outbox.
+  + Remove usages of deprecated gtk_widget_ensure_style().
+  + Remove unused and obsolete evolution-zip.in.
+  + Correct draw of all-day events in a day/work-week view.
+  + Incorrect text color for selected cells in ETree/ETable.
+  + Bugs fixed: bgo#607753, bgo#652132, bgo#702703, bgo#704663,
+    bgo#719379, bgo#722068, bgo#731231, bgo#731278, bgo#731549,
+    bgo#731590, bgo#731604, bgo#731770, bgo#731872, bgo#732091,
+    bgo#732091, bgo#732140, bgo#732180, bgo#732502, bgo#732541.
+
+-------------------------------------------------------------------
+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
 

evolution.spec

@@ -19,12 +19,12 @@
 # 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.
 %define evolution_base_version 3.12
-Version:        3.12.3
+Version:        3.12.4
 Release:        0
 # _version needs to be %{version} stripped to major.minor.micro only...
 %define _version %(echo %{version} | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')
@@ -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}