intltool: Fix incorrect localedir setting.

intltool/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=intltool
 pkgver=0.50.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The internationalization tool collection"
 license=('GPL3')
 arch=('i686' 'x86_64')
@@ -10,9 +10,16 @@ url="https://edge.launchpad.net/intltool"
 groups=('base-devel')
 makedepends=('perl')
 depends=('perl-XML-Parser')
-source=(http://edge.launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc})
+source=(http://edge.launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc}
+        localedir-fix.patch)
 sha1sums=('7fddbd8e1bf94adbf1bc947cbf3b8ddc2453f8ad'
-          '85c71e9651df41fc330c5f171fdfe1bf11e44f65')
+          'SKIP'
+          '40619031188a35c96198eaf644ca85e00eb3edca')
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p0 -i ${srcdir}/localedir-fix.patch
+}
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}

intltool/localedir-fix.patch

@@ -0,0 +1,69 @@
+=== modified file 'Makefile.in.in'
+--- Makefile.in.in	2012-01-18 16:37:06 +0000
++++ Makefile.in.in	2013-05-12 17:12:40 +0000
+@@ -33,8 +33,7 @@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+-DATADIRNAME = @DATADIRNAME@
+-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
++localedir = @localedir@
+ subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.
+@@ -108,7 +107,7 @@
+ install-data-yes: all
+ 	linguas="$(USE_LINGUAS)"; \
+ 	for lang in $$linguas; do \
+-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
++	  dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkdir_p) $$dir; \
+ 	  if test -r $$lang.gmo; then \
+ 	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+@@ -142,8 +141,8 @@
+ uninstall:
+ 	linguas="$(USE_LINGUAS)"; \
+ 	for lang in $$linguas; do \
+-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
++	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
++	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ 	done
+ 
+ check: all $(GETTEXT_PACKAGE).pot
+
+=== modified file 'intltool.m4'
+--- intltool.m4	2012-02-20 14:50:33 +0000
++++ intltool.m4	2013-05-12 17:12:40 +0000
+@@ -155,31 +155,6 @@
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
+ AC_SUBST(ALL_LINGUAS)
+ 
+-# Set DATADIRNAME correctly if it is not set yet
+-# (copied from glib-gettext.m4)
+-if test -z "$DATADIRNAME"; then
+-  AC_LINK_IFELSE(
+-    [AC_LANG_PROGRAM([[]],
+-                     [[extern int _nl_msg_cat_cntr;
+-                       return _nl_msg_cat_cntr]])],
+-    [DATADIRNAME=share],
+-    [case $host in
+-    *-*-solaris*)
+-    dnl On Solaris, if bind_textdomain_codeset is in libc,
+-    dnl GNU format message catalog is always supported,
+-    dnl since both are added to the libc all together.
+-    dnl Hence, we'd like to go with DATADIRNAME=share
+-    dnl in this case.
+-    AC_CHECK_FUNC(bind_textdomain_codeset,
+-      [DATADIRNAME=share], [DATADIRNAME=lib])
+-    ;;
+-    *)
+-    [DATADIRNAME=lib]
+-    ;;
+-    esac])
+-fi
+-AC_SUBST(DATADIRNAME)
+-
+ IT_PO_SUBDIR([po])
+ 
+ ])