From c8b04ac62c8cbfa9ef7dea5fccf851bc1ff17290 Mon Sep 17 00:00:00 2001
From: frank <frank.zhang@citrix.com>
Date: Fri, 6 Jan 2012 14:38:12 -0800
Subject: [PATCH] Bug 12932 - 3.0 beta 2 packages for EL 5.x have missing
 dependencies

for some reason (historical), we got rid of common-httpclient-3.1.jar from
rpm. Actually we should not have done it, higher verison httpclient is not API
compatiable with the one used by CloudStack

status 12932: resolved fixed

Conflicts:

	cloud.spec
---
 cloud.spec    | 6 ++++++
 wscript_build | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cloud.spec b/cloud.spec
index 2584a20425f..02e2d37e4b2 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -466,6 +466,12 @@ fi
 %files deps
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-commons-codec-1.4.jar
+%{_javadir}/%{name}-commons-dbcp-1.4.jar
+%{_javadir}/%{name}-commons-pool-1.5.6.jar
+%{_javadir}/%{name}-commons-httpclient-3.1.jar
+%{_javadir}/%{name}-google-gson-1.7.1.jar
+%{_javadir}/%{name}-netscaler.jar
+%{_javadir}/%{name}-netscaler-sdx.jar
 %{_javadir}/%{name}-log4j-extras.jar
 %{_javadir}/%{name}-backport-util-concurrent-3.0.jar
 %{_javadir}/%{name}-ehcache.jar
diff --git a/wscript_build b/wscript_build
index 674f5a8e966..ddae523e1ed 100644
--- a/wscript_build
+++ b/wscript_build
@@ -110,9 +110,7 @@ def build_thirdparty_dir ():
 	Utils.pprint ("GREEN", "Installed files of thirdparty/")
 
 def build_dependences ():
-	excludes = ["cloud-xstream-1.3.1.jar", "cloud-commons-dbcp-1.2.2.jar", 
-				"cloud-commons-httpclient-3.1.jar", "cloud-commons-pool-1.4.jar",
-				"cloud-servlet-api.jar", "cloud-commons-logging-1.1.1.jar",
+	excludes = ["cloud-xstream-1.3.1.jar", "cloud-servlet-api.jar", "cloud-commons-logging-1.1.1.jar",
 				"cloud-ws-commons-util-1.0.2.jar",
 				"cloud-commons-collections-3.2.1.jar"]