From cc2146630c92b1ddc3b60e46edf2a3ef83c8b50d Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Jul 19 2006 11:19:24 +0000
Subject: - fix buildconf with autoconf 2.60 (#199067)


---

diff --git a/apr-1.2.7-ac260.patch b/apr-1.2.7-ac260.patch
new file mode 100644
index 0000000..2fb540e
--- /dev/null
+++ b/apr-1.2.7-ac260.patch
@@ -0,0 +1,38 @@
+
+Author: jorton
+Date: Wed Jul 19 04:07:31 2006
+New Revision: 423435
+
+URL: http://svn.apache.org/viewvc?rev=423435&view=rev
+Log:
+* build/apr_common.m4 (APR_CONFIG_NICE, APR_PARSE_ARGUMENTS): Fix to
+remove assumption that $@ is preserved forever - it never was in any
+autoconf release; autoconf 2.60 happens to overwrite it earlier.
+
+--- apr-1.2.7/build/apr_common.m4.ac260
++++ apr-1.2.7/build/apr_common.m4
+@@ -64,7 +64,12 @@
+     echo "NOTEST_LIBS=\"$NOTEST_LIBS\"; export NOTEST_LIBS" >> $1
+   fi
+ 
+-  for arg in [$]0 "[$]@"; do
++  # Retrieve command-line arguments.
++  eval "set x $[0] $ac_configure_args"
++  shift
++
++  for arg
++  do
+     APR_EXPAND_VAR(arg, $arg)
+     echo "\"[$]arg\" \\" >> $1
+   done
+@@ -800,6 +805,10 @@
+ dnl set ups.
+ AC_DEFUN(APR_PARSE_ARGUMENTS,[
+ ac_prev=
++# Retrieve the command-line arguments.  The eval is needed because
++# the arguments are quoted to preserve accuracy.
++eval "set x $ac_configure_args"
++shift
+ for ac_option
+ do
+   # If the previous option needs an argument, assign it.
diff --git a/apr.spec b/apr.spec
index fe1b332..b68a13a 100644
--- a/apr.spec
+++ b/apr.spec
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.2.7
-Release: 9.1
+Release: 10
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -18,6 +18,7 @@ Patch3: apr-1.2.2-locktimeout.patch
 Patch4: apr-1.2.2-libdir.patch
 Patch5: apr-1.2.7-pkgconf.patch
 Patch6: apr-1.2.7-psprintfpi.patch
+Patch7: apr-1.2.7-ac260.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildPrereq: autoconf, libtool, doxygen, e2fsprogs-devel
 Conflicts: subversion < 0.20.1-2
@@ -49,6 +50,7 @@ C data structures and routines.
 %patch4 -p1 -b .libdir
 %patch5 -p1 -b .pkgconf
 %patch6 -p1 -b .psprintfpi
+%patch7 -p1 -b .ac260
 
 %build
 # regenerate configure script etc.
@@ -128,7 +130,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - sh: gcc: command not found
+* Wed Jul 19 2006 Joe Orton <jorton@redhat.com> 1.2.7-10
+- fix buildconf with autoconf 2.60 (#199067)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> 1.2.7-9.1
 - rebuild
 
 * Mon Jun 19 2006 Joe Orton <jorton@redhat.com> 1.2.7-9