From d12fa8db30b170c546432e531de27ea37a3a5c38 Mon Sep 17 00:00:00 2001
From: ikent <ikent@fedoraproject.org>
Date: Thu, 19 Jan 2006 12:39:22 +0000
Subject: [PATCH] - Replace check-is-multi with more general multi-parse-fix. -
 Add fix for premature return when waiting for lock file. - Update copyright
 declaration for reentrant-syslog source. - Add patch for configure option to
 disable locking during mount. But don't     disable locking by default. - Add
 ability to handle automount schema used in Sun directory server. - Quell
 compiler warning about getsockopt parameter. - Quell compiler warning about
 yp_order parameter.

---
 autofs.spec | 57 +++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/autofs.spec b/autofs.spec
index 3b19594..7aace3b 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -4,29 +4,35 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 4.1.4
-%define release 14.1
+%define release 16
 Version: %{version}
-Release: %{release}.1
+Release: %{release}
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-%{version}.tar.bz2
 Patch1: autofs-4.1.4-reentrant-syslog.patch
-Patch2: autofs-4.1.4-init-nsswitch-comment.patch
-Patch3: autofs-4.1.4-init-one-auto-master.patch
-Patch4: autofs-4.1.4-init-browse-as-non-first-option.patch
-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
-Patch10: autofs-4.1.4-cache-update-race-fix.patch
-Patch11: autofs-4.1.4-solaris-hosts-in-auto-master.patch
-Patch12: autofs-4.1.4-keylen-length-check.patch
-Patch13: autofs-4.1.4-sun-parse-fixes.patch
-Patch14: autofs-4.1.4-check-return-of-is-local-addr.patch
-Patch15: autofs-4.1.4-fix-sort-opts.patch
-Patch16: autofs-4.1.4-no-slash-misc.patch
+Patch2: autofs-4.1.4-reentrant-syslog-copyright.patch
+Patch3: autofs-4.1.4-init-nsswitch-comment.patch
+Patch4: autofs-4.1.4-init-one-auto-master.patch
+Patch5: autofs-4.1.4-init-browse-as-non-first-option.patch
+Patch6: autofs-4.1.4-hesiod-bind.patch
+Patch7: autofs-4.1.4-non-replicated-ping.patch
+Patch8: autofs-4.1.4-check-nsswitch-submount.patch
+Patch9: autofs-4.1.3-alt-master-ldap.patch
+Patch10: autofs-4.1.4-multi-parse-fix.patch
+Patch11: autofs-4.1.4-cache-update-race-fix.patch
+Patch12: autofs-4.1.4-solaris-hosts-in-auto-master.patch
+Patch13: autofs-4.1.4-keylen-length-check.patch
+Patch14: autofs-4.1.4-sun-parse-fixes.patch
+Patch15: autofs-4.1.4-check-return-of-is-local-addr.patch
+Patch16: autofs-4.1.4-fix-sort-opts.patch
+Patch17: autofs-4.1.4-no-slash-misc.patch
+Patch18: autofs-4.1.4-locking-fix.patch
+Patch19: autofs-4.1.4-configureable-locking.patch
+Patch20: autofs-4.1.4-sol10-schema.patch
+Patch21: autofs-4.1.4-sockopt-len-type.patch
+Patch22: autofs-4.1.4-yp_order-order-type.patch
 
 Buildroot: /var/tmp/autofs-tmp
 BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@@ -82,6 +88,13 @@ echo %{version}-%{release} > .version
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -135,6 +148,16 @@ exit 0
 %{_libdir}/autofs/*
 
 %changelog
+* Mon Jan 17 2006 Ian Kent <ikent@redhat.com> - 1:4.1.4-16
+- Replace check-is-multi with more general multi-parse-fix.
+- Add fix for premature return when waiting for lock file.
+- Update copyright declaration for reentrant-syslog source.
+- Add patch for configure option to disable locking during mount.
+  But don't disable locking by default.
+- Add ability to handle automount schema used in Sun directory server.
+- Quell compiler warning about getsockopt parameter.
+- Quell compiler warning about yp_order parameter.
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt