- Remove commented-out sections

- Clean up some lintian warnings

Signed-off-by: Andrew Price <anprice@redhat.com>

gfs2-utils.spec

@@ -12,10 +12,10 @@
 
 Name: gfs2-utils
 Version: 3.1.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Kernel
-Summary: Utilities for managing the global filesystem (GFS2)
+Summary: Utilities for managing the global file system (GFS2)
 Requires(post): chkconfig
 Requires(preun): initscripts
 Requires(preun): chkconfig
@@ -26,13 +26,9 @@ BuildRequires: ncurses-devel
 BuildRequires: glibc-kernheaders
 BuildRequires: automake
 BuildRequires: perl
-#BuildRequires: corosynclib-devel
-#BuildRequires: clusterlib-devel
-#BuildRequires: openaislib-devel
 BuildRequires: libtool
 BuildRequires: zlib-devel
 BuildRequires: gettext-devel
-#BuildRequires: systemd-units
 URL: https://fedorahosted.org/cluster/wiki/HomePage
 
 # The source for this package was pulled from the upstream git tree.
@@ -75,7 +71,6 @@ rm -f %{buildroot}/sbin/mount.gfs2
 # Remove gfs_control and the gfs_controld man page (temporary)
 rm -f %{buildroot}%{_mandir}/man8/gfs_controld.8
 rm -f %{buildroot}/usr/sbin/gfs_control
-#install -D -m 0644 ./gfs2/system/gfs2-cluster.service %{buildroot}%{_unitdir}/gfs2-cluster.service
 
 %clean
 rm -rf %{buildroot}
@@ -84,7 +79,7 @@ rm -rf %{buildroot}
 %description -n gfs2-utils
 The gfs2-utils package contains a number of utilities for creating,
 checking, modifying, and correcting any inconsistencies in GFS2
-filesystems.
+file systems.
 
 %files -n gfs2-utils
 %defattr(-,root,root,-)
@@ -95,67 +90,11 @@ filesystems.
 %{_mandir}/man8/*gfs2*
 %{_mandir}/man5/*
 
-#%package -n gfs2-cluster
-#Group: System Environment/Base
-#Summary: Cluster daemons for GFS2
-#Requires(post): chkconfig
-#Requires(preun): initscripts
-#Requires(preun): chkconfig
-## SysVinit to Systemd migration bits taken from
-## https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
-#Requires(post): systemd-units
-#Requires(preun): systemd-units
-#Requires(postun): systemd-units
-#Requires(post): systemd-sysv
-#Requires: corosync >= 1.2.7-1
-#Requires: openais >= 1.1.2-1
-#Requires: cman >= 3.1.0-1
-#Obsoletes: cman < 3.1.0
-#Obsoletes: gfs-pcmk < 3.1.0
-#Provides: gfs-pcmk = %{version}
-
-#%description -n gfs2-cluster
-#This package contains the gfs_controld daemon and associated tools
-#required to use GFS2 in a cluster. Virtually every user of GFS2 will
-#need to install this package.
-
-#%post -n gfs2-cluster
-#if [ $1 -eq 1 ] ; then
-#    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-#fi
-
-#%preun -n gfs2-cluster
-#if [ $1 -eq 0 ] ; then
-#    # Package removal, not upgrade
-#    /bin/systemctl --no-reload disable gfs2-cluster.service > /dev/null 2>&1 || :
-#    /bin/systemctl stop gfs2-cluster.service > /dev/null 2>&1 || :
-#fi
-
-#%postun -n gfs2-cluster
-#/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-#if [ $1 -ge 1 ] ; then
-#    # Package upgrade, not uninstall
-#    /bin/systemctl try-restart gfs2-cluster.service >/dev/null 2>&1 || :
-#fi
-
-#%triggerun -- gfs2-cluster < 3.1.3-1
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply httpd
-# to migrate them to systemd targets
-#/usr/bin/systemd-sysv-convert --save gfs2-cluster >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-#/sbin/chkconfig --del gfs2-cluster >/dev/null 2>&1 || :
-#/bin/systemctl try-restart gfs2-cluster.service >/dev/null 2>&1 || :
-
-#%files -n gfs2-cluster
-#%defattr(-,root,root,-)
-#%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence
-#%{_unitdir}/gfs2-cluster.service
-#%{_sbindir}/gfs_control*
-#%{_mandir}/man8/gfs_control*
-
 %changelog
+* Tue Apr 17 2012 Andrew Price <anprice@redhat.com> - 3.1.4-4
+- Remove commented-out sections
+- Clean up some lintian warnings
+
 * Wed Mar 07 2012 Andrew Price <anprice@redhat.com> - 3.1.4-3
 - Remove redundant postinstall scriptlet