evolution-data-server: fix locale installation path

fixes:

WARNING: QA Issue: evolution-data-server: Files/directories were installed but not shipped in any package:
  /usr/locale
  /usr/locale/xh
  /usr/locale/hu
  /usr/locale/nn
  /usr/locale/fi
...

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

2 files changed, 35 insertions, 0 deletions

diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch
new file mode 100644
index 000000000..741e5e97d
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch
@@ -0,0 +1,34 @@
+From 3feaea8e84b3ad8dc2d551e42224f3b4a9413e7d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 3 Sep 2015 11:14:24 +0200
+Subject: [PATCH] configure.ac: do not overwrite localedir
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Backport [1]
+
+[1] https://git.gnome.org/browse/evolution-data-server/tree/configure.ac#n298
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f1d4ce8..cee847f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -257,9 +257,6 @@ GETTEXT_PACKAGE=evolution-data-server-$BASE_VERSION
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
+ 
+-localedir='$(prefix)/$(DATADIRNAME)/locale'
+-AC_SUBST(localedir)
+-
+ dnl ******************************
+ dnl Initialize libtool
+ dnl ******************************
+-- 
+2.1.0
+
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb b/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
index 7c935a3d5..426076fb2 100644
--- a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb
@@ -22,6 +22,7 @@ SRC_URI = " \
     file://0003-Disable-Werror-for-automake.patch \
     file://0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch \
     file://0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch \
+    file://0006-configure.ac-do-not-overwrite-localedir.patch \
     file://iconv-detect.h \
 "