From aa1f7e63644dde77c44c4da190258b2cd9451ad8 Mon Sep 17 00:00:00 2001
From: Bryan Kowal <Bryan.Kowal@raytheon.com>
Date: Tue, 29 Jan 2013 09:51:54 -0600
Subject: [PATCH] Issue #1537 - fixed the edex-environment build

Former-commit-id: 792230a38ecd23ae0f953449f1404b5929e6af0e [formerly a960b3423042c794736b04abd3a9ee2c50027d25] [formerly 7116bb86ef981bdc848cb0bdc42e68f7566a9242] [formerly 792230a38ecd23ae0f953449f1404b5929e6af0e [formerly a960b3423042c794736b04abd3a9ee2c50027d25] [formerly 7116bb86ef981bdc848cb0bdc42e68f7566a9242] [formerly fa511e980b38ee56de80f8561968f527bc50d293 [formerly 7116bb86ef981bdc848cb0bdc42e68f7566a9242 [formerly 4b9bd72e929e36d5c949589d5cc4ed6648a069ac]]]]
Former-commit-id: fa511e980b38ee56de80f8561968f527bc50d293
Former-commit-id: a8d14964549548b6f4b7ebbf06221b5716a8eabf [formerly f4e7bead6605c06bbc69074955a28d28af6c3fd3] [formerly 7a615a201ed2fac7d12eeef3455b28a530f92660 [formerly aefeada9d654078a44b4e56ec704fa021f6477ab]]
Former-commit-id: cd37885a8c1aaa8da5e718615e2a2a711aa7c798 [formerly 662f471e5e81556ee47410ef38a3a6f5b74186bf]
Former-commit-id: 1377ae600fb01ebee17abfac275ea19e3077a58a
---
 .../Installer.edex-environment/edex/component.spec           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rpms/awips2.core/Installer.edex-environment/edex/component.spec b/rpms/awips2.core/Installer.edex-environment/edex/component.spec
index c0b40634ce..4477dec224 100644
--- a/rpms/awips2.core/Installer.edex-environment/edex/component.spec
+++ b/rpms/awips2.core/Installer.edex-environment/edex/component.spec
@@ -112,10 +112,11 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
+_QPID_VERSION="0.7"
 RPM_PROJECT="%{_baseline_workspace}/rpms"
 POSTGRES_INITD="${RPM_PROJECT}/awips2.core/Installer.postgresql/scripts/init.d/edex_postgres"
-QPID_INITD="${RPM_PROJECT}/awips2.qpid/SOURCES/qpidd"
-QUEUE_SH="${RPM_PROJECT}/awips2.qpid/SOURCES/queueCreator.sh"
+QPID_INITD="${RPM_PROJECT}/awips2.qpid/${_QPID_VERSION}/SOURCES/qpidd"
+QUEUE_SH="${RPM_PROJECT}/awips2.qpid/${_QPID_VERSION}/SOURCES/queueCreator.sh"
 EDEX_INITD="${RPM_PROJECT}/awips2.edex/Installer.edex-base/scripts/init.d/edex_camel"
 HTTPD_PYPIES_INITD="${RPM_PROJECT}/awips2.core/Installer.httpd-pypies/configuration/etc/init.d/httpd-pypies"