From 1855bbcbee62035620a9aaa488b815267051e2f3 Mon Sep 17 00:00:00 2001 From: Bryan Kowal Date: Thu, 9 Feb 2012 12:14:37 -0600 Subject: [PATCH] Issue #202 - make edex-cots specs compatible with the branch. Former-commit-id: 26243249e27ee347933748aa53e9436e32751d9c --- rpms/awips2.edex/Installer.edex-cots/component.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rpms/awips2.edex/Installer.edex-cots/component.spec b/rpms/awips2.edex/Installer.edex-cots/component.spec index 9b429edb37..7dbb8e603b 100644 --- a/rpms/awips2.edex/Installer.edex-cots/component.spec +++ b/rpms/awips2.edex/Installer.edex-cots/component.spec @@ -55,7 +55,7 @@ copyApplicableDeltas ${RPM_BUILD_ROOT} %{_component_name} \ #---------------------------------------------------------------------------# %install -DEPLOY_SCRIPT="build.edex/deploy-install.xml" +DEPLOY_SCRIPT="deploy-install.xml" # Deploy Edex To Our Temporary Build Directory. @@ -71,10 +71,13 @@ fi ANT_EXE=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-ant` ANT_EXE="${ANT_EXE}/bin/ant" -${ANT_EXE} -file ${WORKSPACE_DIR}/${DEPLOY_SCRIPT} \ +pushd . +cd ${WORKSPACE_DIR}/build.edex +${ANT_EXE} -file ${DEPLOY_SCRIPT} \ -Dinstall.dir=${RPM_BUILD_ROOT}/awips2/edex \ -Dinstaller=true -Dlocal.build=false \ -Dcomponent.to.deploy=edex-cots +popd %pre if [ "${1}" = "1" ]; then @@ -155,4 +158,4 @@ rm -rf ${RPM_BUILD_ROOT} #---------------------------------------------------------------------------# %dir /awips2 %dir /awips2/edex -/awips2/edex/* \ No newline at end of file +/awips2/edex/*