NHC: Clean up packaging & versioning for release

I came up with a handy little set of RPM macros that use `git`
commands to embed multiple bits of useful information into the RPM's
`RELEASE` field (e.g., commit hash, commit count since last tag) while
still guaranteeing to preserve correct version sorting for RPM
upgrades.  The release handling in the specfile has been updated
accordingly.

I also set up the `.in` version of the specfile along with
`configure.ac` to both query the above Git metadata if available, so
hopefully the right stuff will be there no matter which source tarball
or Git repo users build from.

And finally, I updating some specfile wording and such.  Getting ready
to release (at last)!

Author: mej

configure.ac

@@ -1,5 +1,9 @@
+m4_define([nhc_pkgname], [lbnl-nhc])
+m4_define([nhc_version], [1.4.3])
+m4_define([nhc_address], [[email protected]])
+
 AC_PREREQ(2.59)
-AC_INIT([lbnl-nhc], [1.4.3], [[email protected]])
+AC_INIT(defn([nhc_pkgname]), defn([nhc_version]), defn([nhc_address]))
 AC_CONFIG_SRCDIR([.])
 
 AC_PROG_INSTALL
@@ -18,16 +22,16 @@ dnl# "autoconf" time, when we're sure to have a Git repo, rather than configure
 dnl# time.  We have to change the m4 quote characters due to the regex we use.
 AC_MSG_CHECKING([for Git version description])
 changequote(<<, >>)dnl
-GITVERSION=m4_esyscmd(<<git describe --long --dirty | tr -d '\012' | sed -e 's/^[^-]*-//;s/-/./g;s/dirty/1/'>>)
+GITRELEASE=m4_esyscmd(<<git describe --tags HEAD | grep -Eq "^>>nhc_version<<" >&/dev/null && echo -n 1. || echo -n 0. ; git describe --abbrev=4 --always --tags --long --match '[[:digit:]][[:alnum:].]*[[:alnum:]]' --dirty=.1 | cut -d- -f 2- | tr '-' '.'>>)
 changequote([, ])dnl
 
-if test -n "$GITVERSION" ; then
-    AC_MSG_RESULT([$GITVERSION])
+if test -n "$GITRELEASE" ; then
+    AC_MSG_RESULT([$GITRELEASE])
 else
-    GITVERSION=0.g0000000
-    AC_MSG_RESULT([unknown, using default $GITVERSION])
+    GITRELEASE=0.g0000
+    AC_MSG_RESULT([unknown, using default $GITRELEASE])
 fi
-AC_SUBST([GITVERSION])
+AC_SUBST([GITRELEASE])
 
 AC_OUTPUT([
    Makefile

lbnl-nhc.spec.in

@@ -1,15 +1,25 @@
-%{!?_rel:%{expand:%%global _rel 0.@GITVERSION@}}
+%global name    @PACKAGE@
+%global version @VERSION@
+%global release %{rel}%{?dist}
+
+%global gitrelease @GITRELEASE@
+%{expand:%%global gd_rel_delta %(git describe --abbrev=4 --always --tags --long --match '[[:digit:]][[:alnum:].]*[[:alnum:]]' --dirty=.1 | cut -d- -f 2- | tr '-' '.')}
+%{expand:%%global rel_pre_post %(git describe --tags HEAD | grep -Eq '^%{version}' >&/dev/null && echo 1. || echo 0.)}
+%{expand:%%global spec_rel %{rel_pre_post}%{gd_rel_delta}}
+%{!?rel:%{expand:%%global rel %(if test -z "%{spec_rel}" ; then echo "%{gitrelease}" ; else echo "%{spec_rel}" ; fi)}}
 
 %{!?sname:%global sname nhc}
 %{!?nhc_script_dir:%global nhc_script_dir %{_sysconfdir}/%{sname}/scripts}
 %{!?nhc_helper_dir:%global nhc_helper_dir %{_libexecdir}/%{sname}}
 
+
 Summary: LBNL Node Health Check
-Name: @PACKAGE@
-Version: @VERSION@
-Release: %{_rel}%{?dist}
+Name: %{name}
+Version: %{version}
+Release: %{release}
 #Release: 1%{?dist}
-License: BSD-3-Clause-LBNL (https://opensource.org/BSD-3-Clause-LBNL)
+# LBNL Open Source License:  https://opensource.org/BSD-3-Clause-LBNL
+License: BSD-3-Clause-LBNL
 Group: Applications/System
 URL: https://github.com/mej/nhc/
 Source: https://github.com/mej/nhc/archive/%{name}-%{version}.tar.gz
@@ -21,14 +31,15 @@ BuildArch: noarch
 BuildRoot: %{?_tmppath}%{!?_tmppath:/var/tmp}/%{name}-%{version}-%{release}-root
 
 %description
-This package contains the LBNL Node Health Check system.
-
-TORQUE (and other resource managers) allow for the execution of a
-script to determine if a node is "healthy" or "unhealthy" and
-potentially mark unhealthy nodes as unavailable.  The scripts
-contained in this package provide a flexible, extensible mechanism for
-collecting health checks to be run on your cluster and specifying
-which checks should be run on which nodes.
+This package contains the LBNL Node Health Check (NHC) system.
+Originally written to serve a very specific niche in validating
+compute nodes of High-Performance Computing (HPC) clusters, its unique
+combination of extensibility, portability, simplicity, and efficiency
+have made it a popular general-purpose system health monitoring and
+management tool.
+
+Complete documentation and example use cases are available on the
+project home page at https://github.com/mej/nhc
 
 
 %prep