From cc17f6ba405c0655dd6af530b8c6719d644eb0cdc8373816ddf4d728e486621f Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 28 Mar 2012 06:27:55 +0000
Subject: [PATCH] Accepting request 111490 from
 home:vuntz:branches:GNOME:Factory

Update to 3.4.0, improved as suggested

OBS-URL: https://build.opensuse.org/request/show/111490
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=167
---
 evolution-3.3.92.tar.xz |  3 ---
 evolution-3.4.0.tar.xz  |  3 +++
 evolution.changes       | 14 ++++++++++++++
 evolution.spec          | 13 ++++++-------
 4 files changed, 23 insertions(+), 10 deletions(-)
 delete mode 100644 evolution-3.3.92.tar.xz
 create mode 100644 evolution-3.4.0.tar.xz

diff --git a/evolution-3.3.92.tar.xz b/evolution-3.3.92.tar.xz
deleted file mode 100644
index d8b7b24..0000000
--- a/evolution-3.3.92.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5932bd6d9c37657dde1ef3350341760c07a7c3022a4c24e7f533dbcd587bc33d
-size 12723252
diff --git a/evolution-3.4.0.tar.xz b/evolution-3.4.0.tar.xz
new file mode 100644
index 0000000..b531924
--- /dev/null
+++ b/evolution-3.4.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7d0eecaa1ee33c15e327b724f2bd7017ea6c732ac764189f0ba2a5ba20bd8e4
+size 12735312
diff --git a/evolution.changes b/evolution.changes
index 480e21d..470e226 100644
--- a/evolution.changes
+++ b/evolution.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Mar 26 08:16:11 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 3.4.0:
+  + Bugs fixed: bgo#672474, bgo#672593.
+  + Updated translations.
+- Use gnome-autogen.sh instead of calls to intltoolize and
+  autoreconf: that's better for GNOME packages, and it comes with
+  the benefit that it fixes the build for this tarball (else,
+  things break because of a gnome-doc-utils bug that got fixed in
+  newer gnome-doc-utils).
+- Also remove hack editing help/Makefile.in in %build: there's no
+  need for that.
+
 -------------------------------------------------------------------
 Tue Mar 20 16:40:01 UTC 2012 - vuntz@opensuse.org
 
diff --git a/evolution.spec b/evolution.spec
index 4e5ccb6..6d3ace5 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -20,7 +20,7 @@
 # wait for port of gtkimageview to gtk3
 %define use_gtkimageview 0
 
-# Set to 1 for patch0
+# Set to 1 because of broken gnome-doc-utils in 3.4.0
 %define need_autogen 1
 
 Name:           evolution
@@ -34,7 +34,7 @@ BuildRequires:  fdupes
 %if %USE_EVOLDAP || %{need_autogen}
 BuildRequires:  gnome-common
 %endif
-BuildRequires:  gnome-doc-utils-devel
+BuildRequires:  gnome-doc-utils-devel >= 0.20.10
 BuildRequires:  gtk-doc
 BuildRequires:  intltool
 BuildRequires:  krb5-devel
@@ -80,15 +80,16 @@ BuildRequires:  pkgconfig(shared-mime-info)
 BuildRequires:  pkgconfig(sm)
 # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
 %define evolution_base_version 3.4
-Version:        3.3.92
+Version:        3.4.0
 Release:        0
+# FIXME: can change need_autogen to 0 on update to > 3.4.0
 # FIXME: check if note on license is still valid (comment before license)
 # FIXME: check with upstream/meego if we want to enable clutter for express mode
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
 License:        LGPL-2.0 ; LGPL-3.0
 Group:          Productivity/Networking/Email/Clients
 # NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859
-Source0:        http://download.gnome.org/sources/evolution/3.3/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/evolution/3.4/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include
 Patch15:        evolution-custom-openldap-includes.patch
 # PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column.
@@ -187,9 +188,7 @@ translation-update-upstream
 
 %build
 %if %USE_EVOLDAP || %{need_autogen}
-autoreconf -f -i
-intltoolize --copy --force
-%{__sed} -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in
+NOCONFIGURE=1 gnome-autogen.sh
 %endif
 %{configure} \
     --disable-scrollkeeper \