From e64a4894339bbdd5b3e47faae5fb70ab1c4e9f5f Mon Sep 17 00:00:00 2001
From: Andrew Price <anprice@redhat.com>
Date: Wed, 21 Aug 2013 12:09:46 +0100
Subject: [PATCH] * Wed Aug 21 2013 Andrew Price <anprice@redhat.com> - 3.1.6-3
 - Install utils into /usr/sbin instead of /sbin   Resolves bz#996539

---
 gfs2-utils.spec | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index f056743..c38c586 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -12,7 +12,7 @@
 
 Name: gfs2-utils
 Version: 3.1.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Kernel
 Summary: Utilities for managing the global file system (GFS2)
@@ -60,6 +60,11 @@ rm -f %{buildroot}/sbin/gfs2_trace
 rm -f %{buildroot}/sbin/gfs2_lockcapture
 rm -f %{buildroot}%{_mandir}/man8/gfs2_trace.8
 rm -f %{buildroot}%{_mandir}/man8/gfs2_lockcapture.8
+# Install into /usr/sbin per UsrMove
+mv %{buildroot}/sbin/fsck.gfs2 %{buildroot}/usr/sbin/
+mv %{buildroot}/sbin/mkfs.gfs2 %{buildroot}/usr/sbin/
+mv %{buildroot}/sbin/gfs2_grow %{buildroot}/usr/sbin/
+mv %{buildroot}/sbin/gfs2_jadd %{buildroot}/usr/sbin/
 
 %clean
 rm -rf %{buildroot}
@@ -72,13 +77,21 @@ file systems.
 %files -n gfs2-utils
 %defattr(-,root,root,-)
 %doc doc/COPYING.* doc/COPYRIGHT doc/README.* doc/*.txt
-/sbin/*
-%{_sbindir}/gfs2_*
+%{_sbindir}/fsck.gfs2
+%{_sbindir}/gfs2_grow
+%{_sbindir}/gfs2_jadd
+%{_sbindir}/mkfs.gfs2
+%{_sbindir}/gfs2_convert
+%{_sbindir}/gfs2_edit
 %{_sbindir}/tunegfs2
 %{_mandir}/man8/*gfs2*
 %{_mandir}/man5/*
 
 %changelog
+* Wed Aug 21 2013 Andrew Price <anprice@redhat.com> - 3.1.6-3
+- Install utils into /usr/sbin instead of /sbin
+  Resolves: rhbz#996539
+
 * Mon Jul 29 2013 Andrew Price <anprice@redhat.com> - 3.1.6-2
 - Don't install gfs2_lockcapture and gfs2_trace
   Resolves: rhbz#987019