Modified config to more closely match 3.4.x pkg

2 files changed, 17 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef2a4167edfa..29524a84d066 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 # Generated by mksrcinfo v8
-# Sun Apr 10 21:52:45 UTC 2016
+# Sun Apr 10 22:57:15 UTC 2016
 pkgbase = gnutls28
 	pkgdesc = A library which provides a secure layer over a reliable transport layer (legacy version)
 	pkgver = 3.3.22
-	pkgrel = 1
+	pkgrel = 2
 	url = http://gnutls.org/
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	license = LGPL2.1
-	makedepends = libidn
 	depends = zlib
 	depends = nettle
 	depends = p11-kit
 	depends = libtasn1
-	depends = gnutls
+	depends = libidn
 	provides = libgnutls28
 	conflicts = libgnutls28
 	source = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-3.3.22.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index f5be13c3e0b2..b5cf2ce5ef53 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,15 +9,14 @@
 _pkgbasename=gnutls
 pkgname=${_pkgbasename}28
 pkgver=3.3.22
-pkgrel=1
+pkgrel=2
 pkgdesc="A library which provides a secure layer over a reliable transport layer (legacy version)"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL2.1')
 url="http://gnutls.org/"
-depends=('zlib' 'nettle' 'p11-kit' 'libtasn1' $_pkgbasename)
+depends=('zlib' 'nettle' 'p11-kit' 'libtasn1' 'libidn')
 provides=('libgnutls28')
 conflicts=('libgnutls28')
-makedepends=('libidn')
 source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/${_pkgbasename}-${pkgver}.tar.xz{,.sig})
 sha256sums=('0ffa233e022e851f3f5f7811ac9223081a0870d5a05a7cf35a9f22e173c7b009'
             'SKIP')
@@ -26,15 +25,24 @@ validpgpkeys=(1F42418905D8206AA754CCDC29EE58B996865171)
 build() {
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
 
-  # build fails without --disable-hardware-acceleration because of assembler errors
+  # Guile disabled for conflict with 3.4.x package
+  # CXX disabled because 3.4.x builds same version libgnutlsxx.so.28.1.0
+  # openssl, dane, tpm disabled to match 3.4.x package even when building
+  #   outside chroot where those deps are installed
+  # local libopts enabled to prevent build issue when autogen is installed
   ./configure --prefix=/usr --libdir=/usr/lib \
     --includedir=/usr/include/gnutls28 \
     --program-suffix=28 \
     --with-zlib \
     --disable-static \
     --disable-guile \
-    --disable-valgrind-tests --disable-hardware-acceleration \
-    --disable-cxx --disable-openssl-compatibility --enable-local-libopts
+    --with-default-trust-store-pkcs11="pkcs11:model=p11-kit-trust;manufacturer=PKCS%2311%20Kit" \
+    --disable-cxx \
+    --disable-openssl-compatibility \
+    --enable-local-libopts \
+    --disable-libdane \
+    --without-tpm \
+    --disable-valgrind-tests
   make
 }