[autofs/f16] * Fri Dec 2 2011 Ian Kent <ikent at redhat.com> - 1:5.0.6-4 - fix lsb service name in init script 2 (bz

[Ian Kent]

commit 376bc61d5bf87f627f948bd9c49304cb10e91ce9
Author: Ian Kent <raven at themaw.net>
Date:   Fri Dec 2 17:34:36 2011 +0800

    * Fri Dec 2 2011 Ian Kent <ikent at redhat.com> - 1:5.0.6-4
    - fix lsb service name in init script 2 (bz712504).

 ...0.6-fix-lsb-service-name-in-init-script-2.patch |   45 ++++++++++++++++++++
 autofs.spec                                        |    7 +++-
 2 files changed, 51 insertions(+), 1 deletions(-)
---
diff --git a/autofs-5.0.6-fix-lsb-service-name-in-init-script-2.patch b/autofs-5.0.6-fix-lsb-service-name-in-init-script-2.patch
new file mode 100644
index 0000000..15ff157
--- /dev/null
+++ b/autofs-5.0.6-fix-lsb-service-name-in-init-script-2.patch
@@ -0,0 +1,45 @@
+autofs-5.0.6 - fix lsb service name in init script 2
+
+From: Ian Kent <raven at themaw.net>
+
+The "Required-Start:" and "Required-Stop:" in the init script header
+incorrectly uses $ypbind instead of ypbind. This isn't correct as
+using names starting with a $ is reserved for standards-defined
+facilities.
+---
+
+ redhat/autofs.init.in |    4 ++--
+ samples/rc.autofs.in  |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+
+diff --git a/redhat/autofs.init.in b/redhat/autofs.init.in
+index 86b7eb4..48d387d 100644
+--- a/redhat/autofs.init.in
++++ b/redhat/autofs.init.in
+@@ -9,8 +9,8 @@
+ #
+ ### BEGIN INIT INFO
+ # Provides: autofs
+-# Required-Start: $network $ypbind
+-# Required-Stop: $network $ypbind
++# Required-Start: $network ypbind
++# Required-Stop: $network ypbind
+ # Default-Start: 3 4 5
+ # Default-Stop: 0 1 2 6
+ # Short-Description: Automounts filesystems on demand
+diff --git a/samples/rc.autofs.in b/samples/rc.autofs.in
+index 0306ef6..35667ba 100644
+--- a/samples/rc.autofs.in
++++ b/samples/rc.autofs.in
+@@ -8,8 +8,8 @@
+ #
+ ### BEGIN INIT INFO
+ # Provides: autofs
+-# Required-Start: $network $ypbind
+-# Required-Stop: $network $ypbind
++# Required-Start: $network ypbind
++# Required-Stop: $network ypbind
+ # Default-Start: 3 4 5
+ # Default-Stop: 0 1 2 6
+ # Short-Description: Automounts filesystems on demand
diff --git a/autofs.spec b/autofs.spec
index bfe6d13..b871fa5 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -22,6 +22,7 @@ Patch10: autofs-5.0.6-fix-wait-for-master-source-mutex.patch
 Patch11: autofs-5.0.6-fix-submount-shutdown-race.patch
 Patch12: autofs-5.0.6-fix-fix-map-source-check-in-file-lookup.patch
 Patch13: autofs-5.0.6-add-disable-move-mount-configure-option.patch
+Patch14: autofs-5.0.6-fix-lsb-service-name-in-init-script-2.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs libtirpc-devel
 Conflicts: cyrus-sasl-lib < 2.1.23-9
@@ -77,6 +78,7 @@ echo %{version}-%{release} > .version
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -131,6 +133,9 @@ fi
 %dir /etc/auto.master.d
 
 %changelog
+* Fri Dec 2 2011 Ian Kent <ikent at redhat.com> - 1:5.0.6-4
+- fix lsb service name in init script 2 (bz712504).
+
 * Tue Nov 8 2011 Ian Kent <ikent at redhat.com> - 1:5.0.6-3
 - improve mount location error reporting.
 - fix paged query more results check.