From 590cd6cd969aa4953d30897c090eb9755223f8a8 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Mon, 7 Jan 2013 08:27:02 -0500
Subject: [PATCH] update to 5.9 release

Also:

- add a -devel package to hold cifsidmap.h
- move mount.cifs to /usr/sbin

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 .gitignore      |  1 +
 cifs-utils.spec | 28 +++++++++++++++++++++++++---
 sources         |  2 +-
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2bd24ea..f8b4ec6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ cifs-utils-4.6.tar.bz2
 /cifs-utils-5.6.tar.bz2
 /cifs-utils-5.7.tar.bz2
 /cifs-utils-5.8.tar.bz2
+/cifs-utils-5.9.tar.bz2
diff --git a/cifs-utils.spec b/cifs-utils.spec
index 3d4996c..4c918dc 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -2,7 +2,7 @@
 %define pre_release %nil
 
 Name:           cifs-utils
-Version:        5.8
+Version:        5.9
 Release:        1%{pre_release}%{?dist}
 Summary:        Utilities for mounting and managing CIFS mounts
 
@@ -24,16 +24,27 @@ work in conjunction with support in the kernel to allow one to mount a
 SMB/CIFS share onto a client and use it as if it were a standard Linux
 file system.
 
+%package devel
+Summary:        Files needed for building plugins for cifs-utils
+Group:          Development/Libraries
+
+%description devel
+The SMB/CIFS protocol is a standard file sharing protocol widely deployed
+on Microsoft Windows machines. This package contains the header file
+necessary for building ID mapping plugins for cifs-utils.
+
 %prep
 %setup -q -n %{name}-%{version}%{pre_release}
 
 %build
-%configure --prefix=/usr
+%configure --prefix=/usr ROOTSBINDIR=%{_sbindir}
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}
+ln -s %{_libdir}/%{name}/idmapwb.so %{buildroot}%{_sysconfdir}/%{name}/idmap-plugin
 mkdir -p %{buildroot}%{_sysconfdir}/request-key.d
 install -m 644 contrib/request-key.d/cifs.idmap.conf %{buildroot}%{_sysconfdir}/request-key.d
 install -m 644 contrib/request-key.d/cifs.spnego.conf %{buildroot}%{_sysconfdir}/request-key.d
@@ -44,22 +55,33 @@ 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
 %{_mandir}/man1/getcifsacl.1.gz
 %{_mandir}/man1/setcifsacl.1.gz
 %{_mandir}/man1/cifscreds.1.gz
 %{_mandir}/man8/cifs.upcall.8.gz
 %{_mandir}/man8/cifs.idmap.8.gz
 %{_mandir}/man8/mount.cifs.8.gz
+%{_mandir}/man8/idmapwb.8.gz
+%config(noreplace) %{_sysconfdir}/cifs-utils/idmap-plugin
 %config(noreplace) %{_sysconfdir}/request-key.d/cifs.idmap.conf
 %config(noreplace) %{_sysconfdir}/request-key.d/cifs.spnego.conf
 
+%files devel
+%{_includedir}/cifsidmap.h
+
 %changelog
+* Mon Jan 07 2013 Jeff Layton <jlayton@redhat.com> 5.9-1
+- update to 5.9
+- move mount.cifs to /usr/sbin per new packaging guidelines
+- add -devel package to hold cifsidmap.h
+
 * Sun Nov 11 2012 Jeff Layton <jlayton@redhat.com> 5.8-1
 - update to 5.8
 
diff --git a/sources b/sources
index 6535575..d7fe7d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6aa9c4347780872fefe5823ac06a8ff3  cifs-utils-5.8.tar.bz2
+7164ad6f7963a31fcbffbe4f14a7cfc6  cifs-utils-5.9.tar.bz2