From f6968e406943b81573bf0c731255210f31c5925e19f2ccc1f110ad5fc15ab4d5 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Thu, 31 May 2012 15:04:51 +0000
Subject: [PATCH] Accepting request 122844 from Base:System

- fix build with automake-1.12
  - add: automake-1.12.patch (forwarded request 122744 from puzel)

OBS-URL: https://build.opensuse.org/request/show/122844
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=48
---
 automake-1.12.patch | 12 ++++++++++++
 gnutls.changes      |  6 ++++++
 gnutls.spec         |  5 ++++-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 automake-1.12.patch

diff --git a/automake-1.12.patch b/automake-1.12.patch
new file mode 100644
index 0000000..8f32930
--- /dev/null
+++ b/automake-1.12.patch
@@ -0,0 +1,12 @@
+Index: gnutls-3.0.19/configure.ac
+===================================================================
+--- gnutls-3.0.19.orig/configure.ac
++++ gnutls-3.0.19/configure.ac
+@@ -37,6 +37,7 @@ dnl Checks for programs.
+ AC_PROG_CC
+ AM_PROG_AS
+ AC_PROG_CXX
++AM_PROG_AR
+ gl_EARLY
+ 
+ # For includes/gnutls/gnutls.h.in.
diff --git a/gnutls.changes b/gnutls.changes
index 158123c..59ae2b0 100644
--- a/gnutls.changes
+++ b/gnutls.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 29 12:51:59 UTC 2012 - puzel@suse.com
+
+- fix build with automake-1.12
+  - add: automake-1.12.patch
+
 -------------------------------------------------------------------
 Thu May 24 07:45:31 UTC 2012 - lnussel@suse.de
 
diff --git a/gnutls.spec b/gnutls.spec
index e7f4df8..ccd1bb2 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -34,11 +34,13 @@ Source1:        baselibs.conf
 Patch0:         gnutls-introduce-gnutls_certificate_set_x509_system_trust.diff
 # suse specific, add support for certificate directories -- lnussel
 Patch1:         gnutls-implement-trust-store-dir.diff
+Patch2:         automake-1.12.patch
 BuildRequires:  automake
 BuildRequires:  gcc-c++
 BuildRequires:  libidn-devel
 BuildRequires:  libnettle-devel >= 2.2
 BuildRequires:  libtasn1-devel
+BuildRequires:  libtool
 BuildRequires:  p11-kit-devel >= 0.11
 BuildRequires:  pkg-config
 BuildRequires:  xz
@@ -126,10 +128,11 @@ Files needed for software development using gnutls.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 echo %{_includedir}/%{name}/abstract.h
 
 %build
-autoreconf
+autoreconf -i
 %configure \
         --disable-static \
         --with-pic \