From 636982f6829362d3c5cfe9f1e278740494f80224 Mon Sep 17 00:00:00 2001
From: "Shawn.Hooper" <Shawn.Hooper@noaa.gov>
Date: Thu, 12 Mar 2015 17:14:33 -0400
Subject: [PATCH] ASM #17164 - Update gfesuite build files

Change-Id: I3f350beb10e2cb4b49d9f755e6cd9c549f1c95a4

Former-commit-id: 713e1be2c2fcb13b808e140fd891dd49f6e47be9 [formerly 206438edb7534d3ffc1cf846f092808d061c2ae8 [formerly 98f47b420c10569ce1ce2cf4c660cacaf0d4bf66] [formerly 713e1be2c2fcb13b808e140fd891dd49f6e47be9 [formerly 446c28f031dd408cea1f79c093d9239e47af0798]]]
Former-commit-id: 206438edb7534d3ffc1cf846f092808d061c2ae8 [formerly 98f47b420c10569ce1ce2cf4c660cacaf0d4bf66]
Former-commit-id: 206438edb7534d3ffc1cf846f092808d061c2ae8
Former-commit-id: ab1c4b8ec3af6aae435a401feeb92097b10ededb
---
 edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml        | 7 +++++--
 rpms/awips2.core/Installer.gfesuite-server/component.spec | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml b/edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml
index b2facf28c0..99cd00953b 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/deploy.xml
@@ -44,6 +44,10 @@
 		<istrue value="${client.build}"/>
 	</condition>
 	
+	<condition property="deploy.hti" value="yes">
+			<isfalse value="${client.build}"/>
+	</condition>
+	
 	<condition property="deploy.svcBackup" value="yes">
 		<and>
 			<isfalse value="${client.build}"/>
@@ -91,13 +95,12 @@
     	</copy>
 	</target>
 	
-	<target name="-deploy.hti" 
+	<target name="-deploy.hti" if="deploy.hti" 
 		description="Deploys HTI software to a specific directory">
 		<!-- copy the CLI tools to the deploy directory -->
 		<echo message="Copying in HTI files" />
 		<copy todir="${gfe.suite.hti}" overwrite="true">
 			<fileset dir="${basedir}/hti"/>
-			<filterset refid="installer.filter.set"/>
 		</copy>
 	</target>
 		
diff --git a/rpms/awips2.core/Installer.gfesuite-server/component.spec b/rpms/awips2.core/Installer.gfesuite-server/component.spec
index 5d322ca3fb..0ac8db5883 100644
--- a/rpms/awips2.core/Installer.gfesuite-server/component.spec
+++ b/rpms/awips2.core/Installer.gfesuite-server/component.spec
@@ -96,6 +96,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir /awips2
 %dir /awips2/GFESuite
 /awips2/GFESuite/*
+%defattr(775,awips,fxalpha,775)
+%dir /awips2/GFESuite/hti
+/awips2/GFESuite/hti/*
 %defattr(755,awips,fxalpha,755)
 %dir /awips2/GFESuite/bin
 /awips2/GFESuite/bin/*