From 51d901448ed71f321bfdf4018520f879dff8aa84 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Jan 20 2011 13:24:56 +0000
Subject: GFS2: Remove mount.gfs2 and its man page from gfs2-utils


The mount.gfs2 binary is not required for recent kernels and
has been optional for a while. The plan is to no longer include
it in rawhide. When all versions of Fedora no longer have mount.gfs2
(i.e. when F14 is EOL) then mount.gfs2 will be removed from the
upstream source.

Do not pull this change into earlier versions of Fedora since those
may have kernels without all of the support required for this
feature.

---

diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index a965e53..a968386 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -12,7 +12,7 @@
 
 Name: gfs2-utils
 Version: 3.1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Kernel
 Summary: Utilities for managing the global filesystem (GFS2)
@@ -54,6 +54,10 @@ rm -rf %{buildroot}
 # gfs and group installed separately to avoid pulling in the docs
 make -C gfs2 install DESTDIR=%{buildroot}
 make -C group install DESTDIR=%{buildroot}
+# Remove mount.gfs2 and its man page (temporary)
+rm -f %{buildroot}%{_mandir}/man8/mount.gfs2.8
+rm -f %{buildroot}/sbin/mount.gfs2
+# End of temporary section (until mount.gfs2 removed from source)
 install -D -m 0755 ./gfs2/init.d/gfs2 %{buildroot}%{_sysconfdir}/rc.d/init.d/gfs2
 install -D -m 0755 ./gfs2/init.d/gfs2-cluster %{buildroot}%{_sysconfdir}/rc.d/init.d/gfs2-cluster
 
@@ -63,7 +67,7 @@ rm -rf %{buildroot}
 
 %description -n gfs2-utils
 The gfs2-utils package contains a number of utilities for creating,
-mounting, checking, modifying, and correcting any inconsistencies in GFS2
+checking, modifying, and correcting any inconsistencies in GFS2
 filesystems.
 
 This package can be used standalone for single node GFS2 filesystems,
@@ -86,7 +90,6 @@ exit 0
 %{_sysconfdir}/rc.d/init.d/gfs2
 /sbin/*
 %{_sbindir}/gfs2_*
-%{_sbindir}/gfs2_tool
 %{_sbindir}/tunegfs2
 %{_mandir}/man8/*gfs2*
 %{_mandir}/man5/*
@@ -126,6 +129,10 @@ fi
 %{_mandir}/man8/gfs_control*
 
 %changelog
+* Thu Jan 20 2011 Steven Whitehouse <swhiteho@redhat.com> - 3.1.0-4
+- Drop mount.gfs2 and its man page
+- Only list gfs2_tool once in the files list
+
 * Wed Dec  8 2010 Fabio M. Di Nitto <fdinitto@redhat.com> - 3.1.0-3
 - Drop circular dependency on cman