trunk -> 1.0.1 release

launchmon.spec

@@ -84,7 +84,12 @@ make
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p ${RPM_BUILD_ROOT}%{module_path}
-cp ${RPM_BUILD_DIR}/%{name}-%{version}/launchmon.module ${RPM_BUILD_ROOT}%{module_path}/%{version}
+
+#
+# the release number -4 must be matched with what's in META
+#
+#
+cp ${RPM_BUILD_DIR}/%{name}-%{version}-4/launchmon.module ${RPM_BUILD_ROOT}%{module_path}/%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT

tools/handshake/Makefile.am

@@ -28,10 +28,17 @@
 ##--------------------------------------------------------------------------------
 ##
 ##  Update Log:
+##        May 01 2014 DHA: Specify gcrypt header file locations so that
+##                         this module will use the integrated version of
+##                         gcrypt/gpgerr package. TODO: drop support for
+##                         the integrated gcrypt support and make it an
+##                         external dependency.
 ##        Apr 15 2014 DHA: Add handshake.h so that it is included into the distro
 ##        Mar 10 2014 MPL: Add secure handshake
 ##
 
 noinst_LTLIBRARIES = libhandshake.la 
+INCLUDES = -I$(top_srcdir)/@GCRYPTLOC@ -I$(top_srcdir)/@GPGERRLOC@
 libhandshake_la_SOURCES = handshake.c handshake.h
 libhandshake_la_LIBADD = $(MUNGE_LIBS)
+

tools/handshake/Makefile.in

@@ -236,6 +236,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 tvcmd = @tvcmd@
 noinst_LTLIBRARIES = libhandshake.la 
+INCLUDES = -I$(top_srcdir)/@GCRYPTLOC@ -I$(top_srcdir)/@GPGERRLOC@
 libhandshake_la_SOURCES = handshake.c handshake.h
 libhandshake_la_LIBADD = $(MUNGE_LIBS)
 all: all-am