From c8c031d8d758ca4b0a1f8d4ec025c6e30a1ec7b0 Mon Sep 17 00:00:00 2001
From: Bryan Kowal <Bryan.Kowal@raytheon.com>
Date: Wed, 7 Mar 2012 10:22:40 -0600
Subject: [PATCH] Issue #202 - Removed questionable 12.2.1 changes to the
 soon-to-be deprecated rpm core build.sh script; the gfesuite rpms will now
 manually created needed directories. At one time the directories were
 probably baselined until we switched to git.

Former-commit-id: d4142689c91917df54cd8911cdfbf69c9a4b5417 [formerly 4d8d3d4d006057b7be5680f1ce0258e99ac48b8d] [formerly d4142689c91917df54cd8911cdfbf69c9a4b5417 [formerly 4d8d3d4d006057b7be5680f1ce0258e99ac48b8d] [formerly c803afd45452f23f2fb4a3b12d7c132ef10b0ae2 [formerly 75cac6f9bf1dc237c4131e47912c595adb6aa0d7]]]
Former-commit-id: c803afd45452f23f2fb4a3b12d7c132ef10b0ae2
Former-commit-id: f046b941ba19d234fa532b5686467aa7ef14176e [formerly 033a4e237bcbf09a287c60d172eb7e3c9178bd8c]
Former-commit-id: 2cc79e1acb9f1ad791b29ea356b5bcc9e7d55d13
---
 .../Installer.gfesuite-client/component.spec  | 21 +++++++++++++++++
 .../Installer.gfesuite-server/component.spec  | 23 ++++++++++++++++++-
 rpms/awips2.core/deploy.builder/build.sh      |  4 ++--
 3 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/rpms/awips2.core/Installer.gfesuite-client/component.spec b/rpms/awips2.core/Installer.gfesuite-client/component.spec
index 3849fe4791..f2a7159998 100644
--- a/rpms/awips2.core/Installer.gfesuite-client/component.spec
+++ b/rpms/awips2.core/Installer.gfesuite-client/component.spec
@@ -58,6 +58,21 @@ if [ ${RC} -ne 0 ]; then
    exit 1
 fi
 
+# Create additional directories that are required; the baselined empty
+# directories were lost when we started using git.
+mkdir -p ${RPM_BUILD_ROOT}/awips2/GFESuite/exportgrids/tmp
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+mkdir -p ${RPM_BUILD_ROOT}/awips2/GFESuite/exportgrids2
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+mkdir -p ${RPM_BUILD_ROOT}/awips2/GFESuite/products/ISC
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
 # Copy the profile.d scripts.
 PROFILE_D_DIR="Installer.rpm/common/environment/awips2-gfesuite/profile.d"
 cp ${WORKSPACE_DIR}/${PROFILE_D_DIR}/* ${RPM_BUILD_ROOT}/etc/profile.d
@@ -75,3 +90,9 @@ cp ${WORKSPACE_DIR}/${PROFILE_D_DIR}/* ${RPM_BUILD_ROOT}/etc/profile.d
 %defattr(644,awips,fxalpha,755)
 %dir /awips2/GFESuite/bin/src
 /awips2/GFESuite/bin/src/*
+%dir /awips2/GFESuite/exportgrids
+/awips2/GFESuite/exportgrids/*
+%dir /awips2/GFESuite/exportgrids2
+%defattr(644,awips,fxalpha,775)
+%dir /awips2/GFESuite/products
+/awips2/GFESuite/products/*
\ No newline at end of file
diff --git a/rpms/awips2.core/Installer.gfesuite-server/component.spec b/rpms/awips2.core/Installer.gfesuite-server/component.spec
index 4299cebd13..e134015752 100644
--- a/rpms/awips2.core/Installer.gfesuite-server/component.spec
+++ b/rpms/awips2.core/Installer.gfesuite-server/component.spec
@@ -58,6 +58,21 @@ if [ ${RC} -ne 0 ]; then
    exit 1
 fi
 
+# Create additional directories that are required; the baselined empty
+# directories were lost when we started using git.
+mkdir -p ${RPM_BUILD_ROOT}/awips2/GFESuite/exportgrids/tmp
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+mkdir -p ${RPM_BUILD_ROOT}/awips2/GFESuite/exportgrids2
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+mkdir -p ${RPM_BUILD_ROOT}/awips2/GFESuite/products/ISC
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
 # Copy the profile.d scripts.
 PROFILE_D_DIR="Installer.rpm/common/environment/awips2-gfesuite/profile.d"
 cp ${WORKSPACE_DIR}/${PROFILE_D_DIR}/* ${RPM_BUILD_ROOT}/etc/profile.d
@@ -75,7 +90,13 @@ cp ${WORKSPACE_DIR}/${PROFILE_D_DIR}/* ${RPM_BUILD_ROOT}/etc/profile.d
 %defattr(644,awips,fxalpha,755)
 %dir /awips2/GFESuite/bin/src
 /awips2/GFESuite/bin/src/*
+%dir /awips2/GFESuite/exportgrids
+/awips2/GFESuite/exportgrids/*
+%dir /awips2/GFESuite/exportgrids2
 %defattr(755,awips,fxalpha,777)
 %dir /awips2/GFESuite/ServiceBackup/scripts
 /awips2/GFESuite/ServiceBackup/scripts/*
-%config(noreplace) /awips2/GFESuite/ServiceBackup/configuration/svcbu.properties 
+%config(noreplace) /awips2/GFESuite/ServiceBackup/configuration/svcbu.properties
+%defattr(644,awips,fxalpha,775)
+%dir /awips2/GFESuite/products
+/awips2/GFESuite/products/*
\ No newline at end of file
diff --git a/rpms/awips2.core/deploy.builder/build.sh b/rpms/awips2.core/deploy.builder/build.sh
index 51b91fa220..92ad39bf8d 100755
--- a/rpms/awips2.core/deploy.builder/build.sh
+++ b/rpms/awips2.core/deploy.builder/build.sh
@@ -4,8 +4,8 @@ set -x
 # We Need To Setup Our Environment.
 source env.sh
 
-echo "The AWIPSII Version is $AWIPSII_VERSION WTF WTF WTF WTF"
-echo "The AWIPSII Release is $AWIPSII_RELEASE WTF WTF WTF WTF"
+echo "The AWIPSII Version is $AWIPSII_VERSION "
+echo "The AWIPSII Release is $AWIPSII_RELEASE "