From 99d7b7d8d402e06cf2580801c2731ade9916e9e9 Mon Sep 17 00:00:00 2001
From: Daniel Novotny <dnovotny@fedoraproject.org>
Date: Aug 27 2008 09:42:07 +0000
Subject: new Autoconf 2.62 requires changes in Autoconf macros (resolves #449479)


---

diff --git a/amanda-2.5.2p1-configure.patch b/amanda-2.5.2p1-configure.patch
new file mode 100644
index 0000000..ec0439b
--- /dev/null
+++ b/amanda-2.5.2p1-configure.patch
@@ -0,0 +1,23 @@
+2008-08-27  Stepan Kasal  <skasal@redhat.com>
+
+	* config/gnulib/extensions.m4 (gl_USE_SYSTEM_EXTENSIONS):
+	Require Autoconf 2.61.
+	(AC_USE_SYSTEM_EXTENSIONS): Do not redefine.
+
+--- amanda/config/gnulib/extensions.m4.orig	2008-08-27 10:11:24.000000000 +0200
++++ amanda/config/gnulib/extensions.m4	2008-08-27 10:16:13.000000000 +0200
+@@ -16,7 +16,7 @@
+ # ------------------------
+ # Enable extensions on systems that normally disable them,
+ # typically due to standards-conformance issues.
+-AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
++AC_DEFUN([do_not_redefine_AC_USE_SYSTEM_EXTENSIONS],
+ [
+   AC_BEFORE([$0], [AC_COMPILE_IFELSE])
+   AC_BEFORE([$0], [AC_RUN_IFELSE])
+@@ -55,4 +55,4 @@
+ # Enable extensions on systems that normally disable them,
+ # typically due to standards-conformance issues.
+ AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS],
+-  [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])])
++  [AC_PREREQ(2.61) AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])])
diff --git a/amanda.spec b/amanda.spec
index 63983b4..843443b 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -11,7 +11,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 2.5.2p1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
@@ -23,6 +23,7 @@ Patch3: amanda-2.5.2p1-ylwrapNotFound.patch
 Patch4: amanda-2.5.2p1-undefSymbols.patch
 Patch5: amanda-2.5.2p1-xattrs.patch
 Patch6: amanda-2.5.2p1-typo_chg_multi.patch
+Patch7: amanda-2.5.2p1-configure.patch
 License: BSD
 Group: Applications/System
 URL: http://www.amanda.org
@@ -90,6 +91,7 @@ be used to develop amanda applications.
 %patch4 -p1 -b .undefSymbols
 %patch5 -p1 -b .xattrs
 %patch6 -p1 -b .typo_chg_multi
+%patch7 -p1 -b .configure
 ./autogen
 
 %build
@@ -363,6 +365,10 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf |
 %{_libdir}/libamandad.so
 
 %changelog
+* Wed Aug 27 2008 Daniel Novotny <dnovotny@redhat.com> 2.5.2.p1-11
+- new Autoconf 2.62 requires changes in Autoconf macros
+  (resolves #449479)
+
 * Thu Aug 21 2008 Daniel Novotny <dnovotny@redhat.com> 2.5.2.p1-11
 - Username in /etc/xinetd.d/amanda has to be changed
   to 'amandabackup' because of the change from Thu Nov 22 2007