[cifs-utils] Move mount.cifs back to /sbin

[Jeff Layton]

commit 7f4676b38af657e37a8a0e15fcea21797191efd2
Author: Jeff Layton <jlayton at redhat.com>
Date:   Wed Feb 8 13:31:22 2012 -0500

    Move mount.cifs back to /sbin
    
    It's unnecessary. The symlinks take care of it since there is no
    conflicting filename in /usr/sbin. Also, not moving it is better for
    now since that will allow someone to install this package on earlier
    fedora versions.
    
    Signed-off-by: Jeff Layton <jlayton at redhat.com>

 ...allow-specifying-rootsbindir-at-configure.patch |   59 --------------------
 cifs-utils.spec                                    |   11 ++--
 2 files changed, 6 insertions(+), 64 deletions(-)
---
diff --git a/cifs-utils.spec b/cifs-utils.spec
index b6f41a1..61aafb3 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -3,7 +3,7 @@
 
 Name:           cifs-utils
 Version:        5.3
-Release:        2%{pre_release}%{?dist}
+Release:        3%{pre_release}%{?dist}
 Summary:        Utilities for mounting and managing CIFS mounts
 
 Group:          System Environment/Daemons
@@ -12,7 +12,6 @@ URL:            http://linux-cifs.samba.org/cifs-utils/
 BuildRoot:      %{_tmppath}/%{name}-%{version}%{pre_release}-%{release}-root-%(%{__id_u} -n)
 
 Source0:        ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/%{name}-%{version}%{pre_release}.tar.bz2
-Patch0:		0001-cifs-utils-allow-specifying-rootsbindir-at-configure.patch
 
 BuildRequires:  libcap-ng-devel libtalloc-devel krb5-devel keyutils-libs-devel autoconf automake samba-winbind-devel
 Requires:       keyutils
@@ -27,10 +26,9 @@ file system.
 
 %prep
 %setup -q -n %{name}-%{version}%{pre_release}
-%patch0 -p1
 
 %build
-%configure --prefix=/usr ROOTSBINDIR=%{_sbindir}
+%configure --prefix=/usr
 make %{?_smp_mflags}
 
 %install
@@ -46,10 +44,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
 %{_mandir}/man1/getcifsacl.1.gz
@@ -62,6 +60,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/request-key.d/cifs.spnego.conf
 
 %changelog
+* Wed Feb 08 2012 Jeff Layton <jlayton at redhat.com> 5.3-3
+- revert mount.cifs move. It's unnecessary at this point.
+
 * Wed Feb 08 2012 Jeff Layton <jlayton at redhat.com> 5.3-2
 - move mount.cifs to /usr/sbin per new packaging guidelines