From eb2d2b83c9b90ef8251da0840576f892b66bb102 Mon Sep 17 00:00:00 2001
From: Dong Ahn <ahn1@llnl.gov>
Date: Fri, 2 May 2014 00:03:03 +0000
Subject: [PATCH 1/2] a fix: handshake.c now compiles again the integrated
 gcrypt modules

---
 tools/handshake/Makefile.am | 7 +++++++
 tools/handshake/Makefile.in | 1 +
 2 files changed, 8 insertions(+)

diff --git a/tools/handshake/Makefile.am b/tools/handshake/Makefile.am
index 1788c37..43270ff 100644
--- a/tools/handshake/Makefile.am
+++ b/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)
+
diff --git a/tools/handshake/Makefile.in b/tools/handshake/Makefile.in
index 137bd1e..656958b 100644
--- a/tools/handshake/Makefile.in
+++ b/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

From 0b687a9182177fd721eb4e11cd7993e470cee11b Mon Sep 17 00:00:00 2001
From: Dong Ahn <ahn1@llnl.gov>
Date: Fri, 2 May 2014 00:36:19 +0000
Subject: [PATCH 2/2] use the matching release number in launchmon.spec as in
 META

---
 launchmon.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/launchmon.spec b/launchmon.spec
index c3a3724..7d6fc0b 100644
--- a/launchmon.spec
+++ b/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