[arch-commits] Commit in gnutls/trunk (PKGBUILD buildfix.diff)

[andyrtr at archlinux.org]

    Date: Monday, February 20, 2012 @ 05:15:07
  Author: andyrtr
Revision: 150688

upgpkg: gnutls 3.0.13-2

fix file conflict, FS#28538

Modified:
  gnutls/trunk/PKGBUILD
  gnutls/trunk/buildfix.diff

---------------+
 PKGBUILD      |    4 ++--
 buildfix.diff |   15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-20 07:58:47 UTC (rev 150687)
+++ PKGBUILD	2012-02-20 10:15:07 UTC (rev 150688)
@@ -3,7 +3,7 @@
 
 pkgname=gnutls
 pkgver=3.0.13
-pkgrel=1
+pkgrel=2
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL')
@@ -16,7 +16,7 @@
         buildfix.diff)
 md5sums=('ec549be557f31ea8c1738cb441ef23ec'
          'a6a9a1d148abd6377e7634eb03bdaf7c'
-         'b6284815621293cb4a2f0ad25bcc985d')
+         '9b2a32b41391d95aeb8ddae3756fa191')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

Modified: buildfix.diff
===================================================================
--- buildfix.diff	2012-02-20 07:58:47 UTC (rev 150687)
+++ buildfix.diff	2012-02-20 10:15:07 UTC (rev 150688)
@@ -11,3 +11,18 @@
      }
    else 
      {
+--- a/src/libopts/m4/libopts.m4
++++ b/src/libopts/m4/libopts.m4
+@@ -487,9 +487,9 @@ AC_DEFUN([LIBOPTS_CHECK_COMMON],[
+     fi])
+ 
+   AC_ARG_ENABLE([libopts-install],
+-    AC_HELP_STRING([--disable-libopts-install],
+-       [Do not install libopts with client installation]))
+-  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" != Xno])
++    AC_HELP_STRING([--enable-libopts-install],
++       [Install libopts with client installation]))
++  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" = Xyes])
+ 
+   [if test -z "${NEED_LIBOPTS_DIR}" ; then]
+      AC_MSG_CHECKING([whether autoopts-config can be found])