diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-07 23:19:36 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-07 23:19:36 -0300 |
commit | a73dd5c830228a85fc975c4c4434b796e9e7858b (patch) | |
tree | a4b5b938456b2a4cc3045a8b8d4fd3117b9277db /extra/gnutls | |
parent | 3b4c5929151db9bc1ea2e2e4f4ad22fed88a1a34 (diff) | |
parent | 37e364f033ed6db243d6db524075d8c5394c90f9 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gnustep-make/PKGBUILD
extra/foomatic/PKGBUILD
extra/gnutls/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
staging/libreoffice/PKGBUILD
testing/udev/PKGBUILD
Diffstat (limited to 'extra/gnutls')
-rw-r--r-- | extra/gnutls/PKGBUILD | 19 | ||||
-rw-r--r-- | extra/gnutls/gnutls.install | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 4471ea949..40bc1648a 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153658 2012-03-17 12:17:23Z andyrtr $ +# $Id: PKGBUILD 155767 2012-04-06 09:23:08Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=3.0.17 +pkgver=3.0.18 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -10,12 +10,12 @@ license=('GPL3' 'LGPL') url="http://www.gnu.org/software/gnutls/" install=gnutls.install options=('!libtool' '!zipman') -depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.11') +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12') makedepends=('strace') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('5e87bd73a237749e2acbbb7161f11d5e' - '28138f27cdc9e735b73955080c46c876') +md5sums=('f46539a39857012ccc338a59beb4ac46' + 'fbca6ee827d8db0cea0f9b670b2f5c6c') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -27,14 +27,15 @@ build() { make } -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check # passes all || /bin/true -} +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# make -k check # passes all || /bin/true +#} package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman # gzip -9 all files in infodir and manpages manually find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \; diff --git a/extra/gnutls/gnutls.install b/extra/gnutls/gnutls.install index 9ce7c6edc..e8c8e1798 100644 --- a/extra/gnutls/gnutls.install +++ b/extra/gnutls/gnutls.install @@ -1,5 +1,5 @@ infodir=usr/share/info -filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info.gz) +filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info.gz) post_install() { [ -x usr/bin/install-info ] || return 0 |