[arch-commits] Commit in evolution-ews/trunk (PKGBUILD localedir.patch)

[Jan Steffens]

    Date: Thursday, June 11, 2015 @ 13:46:30
  Author: heftig
Revision: 240570

3.16.3

Added:
  evolution-ews/trunk/localedir.patch
Modified:
  evolution-ews/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   16 ++++++++++++----
 localedir.patch |   25 +++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-11 11:39:34 UTC (rev 240569)
+++ PKGBUILD	2015-06-11 11:46:30 UTC (rev 240570)
@@ -2,7 +2,7 @@
 # Maintainer: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=evolution-ews
-pkgver=3.16.2
+pkgver=3.16.3
 pkgrel=1
 pkgdesc="MS Exchange integration through Exchange Web Services"
 arch=('i686' 'x86_64')
@@ -9,11 +9,19 @@
 license=('LGPL2.1')
 url="https://wiki.gnome.org/Apps/Evolution/EWS"
 depends=('libmspack' 'evolution')
-makedepends=('intltool')
+makedepends=('intltool' 'gnome-common')
 options=('!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('255a29ef7569e4a4d5b4faa6ca2825860e5ffc2ed2e8479def639ec51558c2d3')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        localedir.patch)
+sha256sums=('529d3aa62a6d6d129871d005d95f27b433ad7aeb99f48f395347e18fb0586ad0'
+            '774bb703f5846c14ed4f098311a5595f2738999afdd616e029bb2b53344ea16a')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../localedir.patch
+  autoreconf -fvi
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \

Added: localedir.patch
===================================================================
--- localedir.patch	                        (rev 0)
+++ localedir.patch	2015-06-11 11:46:30 UTC (rev 240570)
@@ -0,0 +1,25 @@
+From 8263b3dbbb58be07e812fcff627a392dd73419ad Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Thu, 11 Jun 2015 10:11:15 +0200
+Subject: configure.ac: Do not override localedir variable
+
+It could place locale files into $PREFIX/locale, instead of $PREFIX/share/locale.
+The change follows bug 703732.
+
+diff --git a/configure.ac b/configure.ac
+index d1c792e..0538904 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -199,9 +199,6 @@ GETTEXT_PACKAGE=evolution-ews
+ 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 ****************************
+-- 
+cgit v0.10.2
+