- fix libtool-2.4.4 build failure, bug 1181698.

am-utils.spec

@@ -5,7 +5,7 @@ Version: 6.2.0
 %define shorthash %(echo "%{githash}" | cut -c -8)
 %define gitdate 20140906
 %define revision 1
-Release: %{revision}.%{gitdate}git%{shorthash}%{?dist}
+Release: 2.%{gitdate}git%{shorthash}%{?dist}
 License: BSD
 Epoch: 5
 Group: System Environment/Daemons
@@ -46,6 +46,9 @@ Requires(preun):  /sbin/install-info
 # automake ylwrap has changed, fix inline patch in bootstrap.
 Patch1: am-utils-6.2.0-1.git.bb13dea6-ylwrap.patch
 
+# Fix problems with possible future libtool rebases (#1181698)
+Patch2: am-utils-6.2.0-1.git.bb13dea6-dont-include-auto-generated-macros-in-aclinlude_m4.patch
+
 # Not needed since autoreconf/libtool appear to do this automatically
 # Leaving it set doesn't appear to be a problem so leave it set in
 # case this changes.
@@ -70,13 +73,15 @@ mounting and unmounting filesystems.
 %setup -q -n %{name}-%{version}-%{revision}.git.%{shorthash}
 
 %patch1 -p1
+%patch2 -p1
+
+./bootstrap
 
 find_requires=%{old_find_requires}
 echo "$find_requires | grep -v lostaltmail.conf" > find-requires
 chmod +x find-requires
 
 %build
-./bootstrap
 %configure \
         --enable-shared \
         --enable-am-cflags="-DHAVE_LINUX_NFS_MOUNT_H" \