From d18ac73aee19fa2894b9a22a194c57a4bb6b1ed2 Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Fri, 31 Aug 2012 18:40:18 +0200
Subject: [PATCH] Add a dependency to mysql-connector-java to the cloud.spec
 file for the client package. Fix some build errors in the spec file

---
 cloud.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloud.spec b/cloud.spec
index 0670ec699ea..23c94834ecf 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -164,6 +164,7 @@ Requires: %{name}-utils = %{version}
 Requires: apache-commons-dbcp
 Requires: apache-commons-collections
 Requires: jakarta-commons-httpclient
+Requires: mysql-connector-java
 %endif
 
 Group:     System Environment/Libraries
@@ -478,7 +479,6 @@ fi
 %{_javadir}/%{name}-log4j.jar
 %{_javadir}/%{name}-trilead-ssh2-build213.jar
 %{_javadir}/%{name}-cglib.jar
-%{_javadir}/%{name}-mysql-connector-java-5.1.7-bin.jar
 %{_javadir}/%{name}-xenserver-5.6.100-1.jar
 %{_javadir}/%{name}-xmlrpc-common-3.*.jar
 %{_javadir}/%{name}-xmlrpc-client-3.*.jar
@@ -589,7 +589,7 @@ fi
 %defattr(0644,cloud,cloud,0755)
 %{_datadir}/cloud/bridge/conf/*
 %{_datadir}/cloud/bridge/lib/*
-%{_datadir}/cloud/bridge/webapps/*
+%{_datadir}/cloud/bridge/webapps7080/*
 %attr(0644,root,root) %{_datadir}/cloud/setup/bridge/db/*
 %attr(0755,root,root) %{_bindir}/cloudstack-aws-api-register
 %attr(0755,root,root) %{_bindir}/cloud-setup-bridge