- Finish up with the merge breakage.

- Temporary fix for the multimount detection code. It seems half-baked.

autofs.spec

@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 3
+%define release 4
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -19,6 +19,7 @@ Patch5: autofs-4.1.4-hesiod-bind.patch
 Patch6: autofs-4.1.4-non-replicated-ping.patch
 Patch7: autofs-4.1.4-check-nsswitch-submount.patch
 Patch8: autofs-4.1.3-alt-master-ldap.patch
+Patch9: autofs-4.1.4-check-is-multi.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -64,6 +65,9 @@ echo %{version}-%{release} > .version
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -117,6 +121,10 @@ exit 0
 %{_libdir}/autofs/*
 
 %changelog
+* Wed Apr 13 2005 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.4-4
+- Finish up with the merge breakage.
+- Temporary fix for the multimount detection code.  It seems half-baked.
+
 * Wed Apr 13 2005 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.4-3
 - Fix up the one-auto-master patch.  My "improvements" had side-effects.