From 74c45e19aa088e0e26258b5c2ff186976e669335 Mon Sep 17 00:00:00 2001 From: Greg Armendariz Date: Wed, 11 Dec 2013 13:30:19 -0600 Subject: [PATCH] Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change Change-Id: I831681915d2e214cf8111faeaabb3176eb3fc3c3 Former-commit-id: 74c49f1eeeba92e8b8c4ffdf6a2457ed1de54813 [formerly 57c98d4343506e8a65db45ecf69d3ea7738581c0] [formerly cb952cdb13c23a6f2633c9a9ad9daf04a05ffbed] [formerly 74c49f1eeeba92e8b8c4ffdf6a2457ed1de54813 [formerly 57c98d4343506e8a65db45ecf69d3ea7738581c0] [formerly cb952cdb13c23a6f2633c9a9ad9daf04a05ffbed] [formerly 2d2641ea7ec190ab3ac9931d20f4a8c0dae2d3a2 [formerly cb952cdb13c23a6f2633c9a9ad9daf04a05ffbed [formerly 584c543fbab59889769570330e7d83529a6b733f]]]] Former-commit-id: 2d2641ea7ec190ab3ac9931d20f4a8c0dae2d3a2 Former-commit-id: 07211ccd006d694edf896967118e01f4c03ed037 [formerly fce327c0013418d963e992d4fffec6735acd6ee8] [formerly 5e9d4ca213ff3e8a2b41e6d180cedfce81e47a93 [formerly f5f21141a44378ee150a899531d3e8edb3aa0898]] Former-commit-id: 8021fd79f7a48694795066c2335fc0f8dbf17fcd [formerly f9f10703e8fd108b7fd2b3a2a80bfcb24174a14b] Former-commit-id: 88437251d75080fe27b37dcccc6fb856de67015d --- rpms/awips2.core/Installer.tools/component.spec | 2 +- .../Installer.tools/scripts/profile.d/awips2HDF5Tools.csh | 2 +- .../Installer.tools/scripts/profile.d/awips2HDF5Tools.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpms/awips2.core/Installer.tools/component.spec b/rpms/awips2.core/Installer.tools/component.spec index 9b07b8514c..860efdeac3 100644 --- a/rpms/awips2.core/Installer.tools/component.spec +++ b/rpms/awips2.core/Installer.tools/component.spec @@ -7,7 +7,7 @@ Name: awips2-tools Summary: AWIPS II Tools Distribution -Version: 1.8.4 +Version: 1.8.5 Release: 2.el6 Group: AWIPSII BuildRequires: awips2-python-h5py diff --git a/rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh b/rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh index 6510b5a4d1..8060e2ed8b 100644 --- a/rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh +++ b/rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh @@ -1,6 +1,6 @@ #!/bin/csh -set HDF5_TOOLS_INSTALL=`rpm -q --queryformat '%{INSTPREFIXES}' awips2-tools` +set HDF5_TOOLS_INSTALL=`rpm -q --queryformat '%{FILENAMES}' awips2-tools` if $?PATH then setenv PATH ${HDF5_TOOLS_INSTALL}/bin:$PATH diff --git a/rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh b/rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh index 1001cca2e6..7c8626dfe1 100644 --- a/rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh +++ b/rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh @@ -8,7 +8,7 @@ if [ ${RC} -ne 0 ]; then fi # Determine Where awips2-tools Has Been Installed. -HDF5_TOOLS_INSTALL=`rpm -q --queryformat '%{INSTPREFIXES}' awips2-tools` +HDF5_TOOLS_INSTALL=`rpm -q --queryformat '%{FILENAMES}' awips2-tools` if [ "${HDF5_TOOLS_INSTALL}" = "" ]; then return fi