[cifs-utils/f18] Revert "Move mount.cifs to /usr/sbin"

[Jeff Layton]

commit d63630d36be841128b2044d69604df797a82b3f8
Author: Jeff Layton <jlayton at redhat.com>
Date:   Tue Jan 8 09:58:32 2013 -0500

    Revert "Move mount.cifs to /usr/sbin"
    
    This reverts commit 571ddb022369b5fe8fb2db4e61e432b56dde4e9c.
    
    Moving this to /usr/sbin causes dependency problems for the
    resource-agents package, which is hardcoded to look for
    /sbin/mount.cifs. I'll just plan to make this change in
    f19 and leave the earlier releases alone.
    
    While we at it, add a patch to fix some comments in cifsidmap.h.

 ...dmap-clean-up-comments-on-API-description.patch |   49 ++++++++++++++++++++
 cifs-utils.spec                                    |   13 ++++-
 2 files changed, 59 insertions(+), 3 deletions(-)
---
diff --git a/0001-cifsidmap-clean-up-comments-on-API-description.patch b/0001-cifsidmap-clean-up-comments-on-API-description.patch
new file mode 100644
index 0000000..54500f6
--- /dev/null
+++ b/0001-cifsidmap-clean-up-comments-on-API-description.patch
@@ -0,0 +1,49 @@
+From 739289ad3ce915e1ee2705ecd7ac4e907cd91405 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton at samba.org>
+Date: Mon, 7 Jan 2013 10:25:30 -0500
+Subject: [PATCH] cifsidmap: clean up comments on API description
+
+...typo and grammatical fixes, mostly.
+
+Signed-off-by: Jeff Layton <jlayton at samba.org>
+---
+ cifsidmap.h | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/cifsidmap.h b/cifsidmap.h
+index 656df86..3c074ae 100644
+--- a/cifsidmap.h
++++ b/cifsidmap.h
+@@ -129,11 +129,11 @@ struct cifs_uxid {
+  * This function should map an array of struct cifs_sids to an array of
+  * struct cifs_uxids.
+  *
+- * Returns 0 if at least one conversion was successful and success and
+- * non-zero on error. Any that were not successfully converted will have a
+- * cuxid->type of CIFS_UXID_TYPE_UNKNOWN.
++ * Returns 0 if at least one conversion was successful and non-zero on error.
++ * Any that were not successfully converted will have a cuxid->type of
++ * CIFS_UXID_TYPE_UNKNOWN.
+  *
+- * On error, the plugin should reset the errmsg pointer passed to the
++ * On any error, the plugin should reset the errmsg pointer passed to the
+  * init_plugin function to an error string. The caller will not free the error
+  * string.
+  *
+@@ -151,10 +151,10 @@ struct cifs_uxid {
+  *
+  * This function should map an array of cifs_uxids an array of struct cifs_sids.
+  * Returns 0 if at least one conversion was successful and non-zero on error.
+- * Any sids that were not successfully converted will have a revision number of
+- * 0.
++ * Any sids that were not successfully converted should have their revision
++ * number set to 0.
+  *
+- * On error, the plugin should reset the errmsg pointer passed to the
++ * On any error, the plugin should reset the errmsg pointer passed to the
+  * init_plugin function to an error string. The caller will not free the error
+  * string.
+  *
+-- 
+1.7.11.7
+
diff --git a/cifs-utils.spec b/cifs-utils.spec
index 4c918dc..d2887d3 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -3,7 +3,7 @@
 
 Name:           cifs-utils
 Version:        5.9
-Release:        1%{pre_release}%{?dist}
+Release:        2%{pre_release}%{?dist}
 Summary:        Utilities for mounting and managing CIFS mounts
 
 Group:          System Environment/Daemons
@@ -16,6 +16,8 @@ Source0:        ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/%{name}-%{version}
 BuildRequires:  libcap-ng-devel libtalloc-devel krb5-devel keyutils-libs-devel autoconf automake libwbclient-devel
 Requires:       keyutils
 
+Patch1:		0001-cifsidmap-clean-up-comments-on-API-description.patch
+
 %description
 The SMB/CIFS protocol is a standard file sharing protocol widely deployed
 on Microsoft Windows machines. This package contains tools for mounting
@@ -35,9 +37,10 @@ necessary for building ID mapping plugins for cifs-utils.
 
 %prep
 %setup -q -n %{name}-%{version}%{pre_release}
+%patch1 -p1
 
 %build
-%configure --prefix=/usr ROOTSBINDIR=%{_sbindir}
+%configure --prefix=/usr
 make %{?_smp_mflags}
 
 %install
@@ -55,10 +58,10 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc
+/sbin/mount.cifs
 %{_bindir}/getcifsacl
 %{_bindir}/setcifsacl
 %{_bindir}/cifscreds
-%{_sbindir}/mount.cifs
 %{_sbindir}/cifs.upcall
 %{_sbindir}/cifs.idmap
 %{_libdir}/%{name}/idmapwb.so
@@ -77,6 +80,10 @@ rm -rf %{buildroot}
 %{_includedir}/cifsidmap.h
 
 %changelog
+* Tue Jan 08 2013 Jeff Layton <jlayton at redhat.com> 5.9-2
+- revert move of mount.cifs to /usr/sbin due to resource-agents dependency
+- comment fixes in cifsidmap.h
+
 * Mon Jan 07 2013 Jeff Layton <jlayton at redhat.com> 5.9-1
 - update to 5.9
 - move mount.cifs to /usr/sbin per new packaging guidelines