From 64d355c5bdbf9f7b16860d4bf9deb0da76364bcb Mon Sep 17 00:00:00 2001
From: ikent <ikent@fedoraproject.org>
Date: Sep 01 2006 06:12:06 +0000
Subject: - consolidate to rc2.

- fix colon escape handling.
- fix recusively referenced bind automounts.
- update kernel patches.

---

diff --git a/.cvsignore b/.cvsignore
index 7a5e769..88460c7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-autofs-5.0.1-rc1.tar.bz2
+autofs-5.0.1-rc2.tar.bz2
diff --git a/autofs.spec b/autofs.spec
index fb3a5b7..2bb906c 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -4,49 +4,13 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc1.17
+%define release 0.rc2.1
 Version: %{version}
 Release: %{release}
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
-Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-rc1.tar.bz2
-Patch1: autofs-5.0.1-rc1-cleanup.patch
-Patch2: autofs-5.0.1-rc1-current-race.patch
-Patch3: autofs-5.0.1-rc1-cthon-parser-1.patch
-Patch4: autofs-5.0.1-rc1-cthon-multi-locking.patch
-Patch5: autofs-5.0.1-rc1-cthon-shutdown-expire.patch
-Patch6: autofs-5.0.1-rc1-cthon-parser-2.patch
-Patch7: autofs-5.0.1-rc1-cthon-cleanup.patch
-Patch8: autofs-5.0.1-rc1-cthon-add-parser-subs.patch
-Patch9: autofs-5.0.1-rc1-cthon-more-cleanup.patch
-Patch10: autofs-5.0.1-rc1-cthon-host-name-validation.patch
-Patch11: autofs-5.0.1-rc1-cthon-submount-fix.patch
-Patch12: autofs-5.0.1-rc1-cthon-parse-and-submounts.patch
-Patch13: autofs-5.0.1-rc1-cthon-expire-nested.patch
-Patch14: autofs-5.0.1-rc1-compile-error.patch
-Patch15: autofs-5.0.1-rc1-shutdown-races.patch
-Patch16: autofs-5.0.1-rc1-shutdown-submount-expire.patch
-Patch17: autofs-5.0.1-rc1-program-wild-expire-fix.patch
-Patch18: autofs-5.0.1-rc1-directory-cleanup.patch
-Patch19: autofs-5.0.1-rc1-remove-sigchld-handler.patch
-Patch20: autofs-5.0.1-rc1-multi-mount-expire-locking.patch
-Patch21: autofs-5.0.1-rc1-verbose-messages.patch
-Patch22: autofs-5.0.1-rc1-expire-multi-correction.patch
-Patch23: autofs-5.0.1-rc1-sloppyopt-nfs.patch
-Patch24: autofs-5.0.1-rc1-release-notes-spelling.patch
-Patch25: autofs-5.0.1-rc1-expire-individual-submounts.patch
-Patch26: autofs-5.0.1-rc1-ino_index-locking.patch
-Patch27: autofs-5.0.1-rc1-check-offset-mounts-before-umount.patch
-Patch28: autofs-5.0.1-rc1-premature-submount-expire.patch
-Patch29: autofs-5.0.1-rc1-more-expire-rework.patch
-Patch30: autofs-5.0.1-rc1-allow-initial-numeric-in-hostname.patch
-Patch31: autofs-5.0.1-rc1-included-map-lookup-fix.patch
-Patch32: autofs-5.0.1-rc1-dir-cleanup-on-expire-fix.patch
-Patch33: autofs-5.0.1-rc1-cancel-tasks-at-shutdown.patch
-Patch34: autofs-5.0.1-rc1-included-map-wild-lookup-fix.patch
-Patch35: autofs-5.0.1-rc1-cancel-tasks-at-shutdown-fix.patch
-Patch36: autofs-5.0.1-rc1-concurrent-mount-expire-nested-submount-race.patch
+Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-rc2.tar.bz2
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -86,42 +50,6 @@ inkludera nätfilsystem, CD-ROM, floppydiskar, och så vidare.
 %prep
 %setup -q
 echo %{version}-%{release} > .version
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -178,6 +106,12 @@ exit 0
 %{_libdir}/autofs/*
 
 %changelog
+* Fri Sep 1 2006 Ian Kent <ikent@redhat.com> - 5.0.1-0.rc2.1
+- consolidate to rc2.
+- fix colon escape handling.
+- fix recusively referenced bind automounts.
+- update kernel patches.
+
 * Fri Aug 25 2006 Ian Kent <ikent@redhat.com> - 5.0.1-0.rc1.17
 - fix task cancelation at shutdown (more)
 - fix concurrent mount and expire race with nested submounts.
diff --git a/sources b/sources
index 1416b70..43c40ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e0f2e83f5fc321dbc5861cb21482a90e  autofs-5.0.1-rc1.tar.bz2
+4ff63b6833cc1eac8d75bff0c10f6d76  autofs-5.0.1-rc2.tar.bz2