From 76bbe51da6200774786eedb97bd71cd03be2acc9 Mon Sep 17 00:00:00 2001
From: Greg Armendariz <greg.armendariz@raytheon.com>
Date: Wed, 4 Feb 2015 09:59:06 -0600
Subject: [PATCH] Omaha #3839 - Add script to /awips2/edex/bin/

Former-commit-id: d8eca1c90a82c184ead9342f11524ed40bf86b6d [formerly efbdfa504bcdc90b0525b087b02565f578813be3] [formerly 25cb96ec19b5c5178fb10f32e7fb1499612bee43] [formerly d8eca1c90a82c184ead9342f11524ed40bf86b6d [formerly efbdfa504bcdc90b0525b087b02565f578813be3] [formerly 25cb96ec19b5c5178fb10f32e7fb1499612bee43] [formerly bb8a61a996b4e4549aa942ba5f9b34941ed2ed9e [formerly 25cb96ec19b5c5178fb10f32e7fb1499612bee43 [formerly c215890342be6fed80d614e0a5853e8ce816a7f2]]]]
Former-commit-id: bb8a61a996b4e4549aa942ba5f9b34941ed2ed9e
Former-commit-id: d8a5867989b710950e3213d6b1919b9e2a5e9055 [formerly c3b4d790a304422e24e53e799919a2d42b8f1ebb] [formerly 203e5232bfa641993a7e1096caa4b0ef2e4b3c3c [formerly d405e4bfe10ff26829399850ccb39b04ebacaac5]]
Former-commit-id: a15a1e71e88b253a90d12a782b1761b2e7c40409 [formerly 956a8fd092baa7a909e13146eeba25e4cf4ee9eb]
Former-commit-id: b0121df3bc1d2181006a77d6c7fd86280e32af24
---
 .../datadelivery.patch0                       | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0 b/rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0
index cf08ccc00e..799d28ef0f 100644
--- a/rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0
+++ b/rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0
@@ -1,5 +1,5 @@
-*** Installer.edex-component/component.spec	2015-02-02 15:31:30.696998251 -0600
---- Installer.edex-datadelivery/component.spec	2015-02-02 15:35:06.923609297 -0600
+*** Installer.edex-component/component.spec	2015-02-03 16:00:27.487303049 -0600
+--- Installer.edex-datadelivery/component.spec	2015-02-03 17:49:00.775069314 -0600
 ***************
 *** 6,13 ****
   %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
@@ -37,7 +37,7 @@
   requires: awips2-edex-base
   requires: awips2-python
 ***************
-*** 47,59 ****
+*** 47,56 ****
   if [ $? -ne 0 ]; then
      exit 1
   fi
@@ -48,10 +48,7 @@
   if [ $? -ne 0 ]; then
      exit 1
   fi
-  
-  #create a list of all files packaged for /awips2/edex/data/utility
-  UTILITY=/awips2/edex/data/utility
---- 47,77 ----
+--- 47,85 ----
   if [ $? -ne 0 ]; then
      exit 1
   fi
@@ -72,17 +69,25 @@
 + EDEX_DATADELIVERY="${INSTALLER_RPM}/awips2.edex/Installer.edex-datadelivery"
 + cp -v ${EDEX_DATADELIVERY}/scripts/init.d/* \
 +    %{_build_root}/etc/init.d
-  if [ $? -ne 0 ]; then
-     exit 1
-  fi
++ if [ $? -ne 0 ]; then
++    exit 1
++ fi
 + # rename the script to prevent naming conflicts during installation
 + pushd . > /dev/null 2>&1
 + cd %{_build_root}/etc/init.d
 + mv edexServiceList edexServiceList-datadelivery
 + popd > /dev/null 2>&1
-  
-  #create a list of all files packaged for /awips2/edex/data/utility
-  UTILITY=/awips2/edex/data/utility
++ 
++ #add central registry script
++ mkdir -p %{_build_root}/awips2/edex/bin/
++ if [ $? -ne 0 ]; then
++    exit 1
++ fi
++ 
++ cp -v %{_baseline_workspace}/deploy.edex-Data_Delivery/esb/bin/centralRegistryProviderCredentials.sh %{_build_root}/awips2/edex/bin/
+  if [ $? -ne 0 ]; then
+     exit 1
+  fi
 ***************
 *** 64,70 ****
   
@@ -92,7 +97,7 @@
   
   #change date stamp of utility files
   UTILITY=/awips2/edex/data/utility
---- 82,98 ----
+--- 93,109 ----
   
   %pre
   %post
@@ -112,7 +117,7 @@
   UTILITY=/awips2/edex/data/utility
 ***************
 *** 78,83 ****
---- 106,122 ----
+--- 117,133 ----
   fi
   
   %preun
@@ -132,9 +137,11 @@
   %clean
 ***************
 *** 88,90 ****
---- 127,131 ----
+--- 138,144 ----
   %dir /awips2
   %dir /awips2/edex
   /awips2/edex/*
++ %dir /awips2/edex/bin
++ %attr(744, -, -) /awips2/edex/bin/centralRegistryProviderCredentials.sh
 + 
 + %attr(744,root,root) /etc/init.d/*