[arch-commits] Commit in recode/trunk (PKGBUILD recode.install)

[Eric Bélanger]

    Date: Sunday, October 27, 2013 @ 02:15:28
  Author: eric
Revision: 197568

upgpkg: recode 3.6-8

Rebuild without static libraries, Update Debian patch, Add autotools build fix, Clean up PKGBUILD and install scriptlet

Modified:
  recode/trunk/PKGBUILD
  recode/trunk/recode.install

----------------+
 PKGBUILD       |   32 +++++++++++++++++---------------
 recode.install |    2 +-
 2 files changed, 18 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-27 00:07:32 UTC (rev 197567)
+++ PKGBUILD	2013-10-27 00:15:28 UTC (rev 197568)
@@ -4,28 +4,33 @@
 
 pkgname=recode
 pkgver=3.6
-pkgrel=7
+pkgrel=8
 pkgdesc="Converts files between various character sets and usages"
 arch=('i686' 'x86_64')
 url="http://recode.progiciels-bpi.ca/index.html"
 license=('GPL' 'LGPL')
-depends=('glibc' 'texinfo')
-options=('!libtool')
+depends=('glibc')
 install=recode.install
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/pinard/${pkgname}/tarball/v${pkgver}"
-        'http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6-15.diff.gz'
+        'http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6-17.diff.gz'
         'recode-3.6-as-if.patch' 'recode-3.6-gettextfix.diff')
 md5sums=('f82e9a6ede9119268c13493c9add2809'
-         '95ca772e367a7ef56d3f46d724b6f86e'
+         '3716ae269074e31add3d29387ff09438'
          'fca7484ba332c8ad59eb02334883cd92'
          'eb602e80a24b5448604bfebeacc55304')
 
+prepare() {
+  cd pinard-Recode-2127b34
+  patch -Np1 -i "${srcdir}/recode-3.6-as-if.patch"
+  patch -Np1 -i "${srcdir}/recode-3.6-gettextfix.diff"
+  patch -Np1 -i "${srcdir}/recode_3.6-17.diff"
+  sed -i '1i#include <stdlib.h>' src/argmatch.c
+  sed -i -e '/^AM_C_PROTOTYPES/d' -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \
+    configure.in src/Makefile.am
+}
+
 build() {
-  cd ${srcdir}/pinard-Recode-2127b34
-  patch -Np1 -i ${srcdir}/recode-3.6-as-if.patch
-  patch -Np1 -i ${srcdir}/recode-3.6-gettextfix.diff
-  patch -Np1 -i ${srcdir}/recode_3.6-15.diff
-  sed -i '1i#include <stdlib.h>' src/argmatch.c
+  cd pinard-Recode-2127b34
   rm -f acinclude.m4
   autoreconf -fi
   libtoolize
@@ -35,9 +40,6 @@
 }
 
 package() {
-  cd ${srcdir}/pinard-Recode-2127b34
-  make DESTDIR=${pkgdir} install
-
-  rm ${pkgdir}/usr/share/info/dir
-  gzip ${pkgdir}/usr/share/info/*
+  cd pinard-Recode-2127b34
+  make DESTDIR="${pkgdir}" install
 }

Modified: recode.install
===================================================================
--- recode.install	2013-10-27 00:07:32 UTC (rev 197567)
+++ recode.install	2013-10-27 00:15:28 UTC (rev 197568)
@@ -1,5 +1,5 @@
 infodir=/usr/share/info
-filelist=(recode.info-5.gz recode.info-3.gz recode.info-7.gz recode.info-6.gz recode.info-2.gz recode.info-4.gz recode.info.gz recode.info-1.gz)
+filelist=(recode.info.gz)
 
 post_install() {
   [ -x usr/bin/install-info ] || return 0