From 22bacfe8fd7c97f30f20d52a79ea0fe6d8c46ab9 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: May 27 2014 12:52:26 +0000
Subject: Update to 5.18.3


---

diff --git a/.gitignore b/.gitignore
index 9a78bd3..41425a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/autogen-5.18.2.tar.xz
+/autogen-5.18.3.tar.xz
diff --git a/autogen-mktplconfig.patch b/autogen-mktplconfig.patch
new file mode 100644
index 0000000..fe25798
--- /dev/null
+++ b/autogen-mktplconfig.patch
@@ -0,0 +1,15 @@
+diff -up autogen-5.18.3/autoopts/mk-tpl-config.sh.mktplconfig autogen-5.18.3/autoopts/mk-tpl-config.sh
+--- autogen-5.18.3/autoopts/mk-tpl-config.sh.mktplconfig	2014-05-10 17:48:26.000000000 +0200
++++ autogen-5.18.3/autoopts/mk-tpl-config.sh	2014-05-27 14:05:26.961175451 +0200
+@@ -200,9 +200,8 @@ fix_guile() {
+     cd ${builddir}
+     find_libguiledir "${LGCFLAGS}"
+ 
+-    list=`set +e ; exec 2>/dev/null
+-        find ${libguiledir}/libguile* -type f | \
+-            xargs grep -l -E '\<noreturn\>'`
++    list=`find ${libguiledir}/libguile* -type f | \
++            xargs grep -l -E '\<noreturn\>' 2> /dev/null || :`
+ 
+     test -z "$list" && exit 0
+ 
diff --git a/autogen.spec b/autogen.spec
index 6215585..056dd89 100644
--- a/autogen.spec
+++ b/autogen.spec
@@ -1,6 +1,6 @@
 Summary:	Automated text file generator
 Name:		autogen
-Version:	5.18.2
+Version:	5.18.3
 Release:	2%{?dist}
 # Some files are licensed under GPLv2+.
 # We redistribute them under GPLv3+.
@@ -11,6 +11,8 @@ Source0:	ftp://ftp.gnu.org/gnu/autogen/rel%{version}/%{name}-%{version}.tar.xz
 
 # Fix multilib conflicts
 Patch0:		autogen-multilib.patch
+# Fix mk-tpl-config.sh to not fail when guile headers don't use noreturn
+Patch1:		autogen-mktplconfig.patch
 
 Requires:	%{name}-libopts%{?_isa} = %{version}-%{release}
 Requires(post):	/sbin/install-info
@@ -56,6 +58,7 @@ This package contains development files for libopts.
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
+%patch1 -p1 -b .mktplconfig
 
 # Disable failing test
 sed -i 's|errors.test||' autoopts/test/Makefile.in
diff --git a/sources b/sources
index ddf0995..a88f16e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1924fdfe36edb3e0fd66add20aca9b70  autogen-5.18.2.tar.xz
+e7e8bb177019771b600f35b124655959  autogen-5.18.3.tar.xz