You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/10/10 04:36:03 UTC
git commit: fix rpm build
Updated Branches:
refs/heads/4.0 7bcbae5e9 -> c49f3becc
fix rpm build
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c49f3bec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c49f3bec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c49f3bec
Branch: refs/heads/4.0
Commit: c49f3beccfcd1257eca1ea06606fb55b3fdf5093
Parents: 7bcbae5
Author: Edison Su <su...@gmail.com>
Authored: Tue Oct 9 19:35:50 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Tue Oct 9 19:35:50 2012 -0700
----------------------------------------------------------------------
cloud.spec | 2 +-
wscript_build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c49f3bec/cloud.spec
----------------------------------------------------------------------
diff --git a/cloud.spec b/cloud.spec
index e267e58..864a47b 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -286,6 +286,7 @@ Summary: CloudStack CloudBridge
Group: System Environment/Libraries
Requires: java >= 1.6.0
Requires: tomcat6
+Requires: javassist
Requires: %{name}-deps = %{version}
%if 0%{?fedora} > 15
Requires: apache-commons-lang
@@ -470,7 +471,6 @@ fi
%{_javadir}/xercesImpl*.jar
%{_javadir}/xml-apis*.jar
%{_javadir}/dom4j*.jar
-%{_javadir}/javassist*.jar
%{_javadir}/commons-fileupload*.jar
%{_javadir}/commons-codec-1.6.jar
%{_javadir}/commons-dbcp-1.4.jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c49f3bec/wscript_build
----------------------------------------------------------------------
diff --git a/wscript_build b/wscript_build
index 595b38f..1fafa26 100644
--- a/wscript_build
+++ b/wscript_build
@@ -164,7 +164,7 @@ def build_dependences ():
bld.install_files('${JAVADIR}',start_path.ant_glob(["CAStorSDK-*.jar", "javax.persistence-2.0.0.jar", "apache-log4j-extras-1.1.jar", "libvirt-0.4.9.jar", "axis2-1.5.1.jar", "jstl-1.2.jar", "commons-discovery-0.5.jar", "commons-codec-1.6.jar", "ejb-api-3.0.jar", "xmlrpc-client-3.1.3.jar", "commons-dbcp-1.4.jar", "commons-pool-1.6.jar", "gson-1.7.1.jar",
"netscaler-1.0.jar", "netscaler-sdx-1.0.jar", "backport-util-concurrent-3.1.jar", "ehcache-1.5.0.jar", "httpcore-4.0.jar", "log4j-1.2.16.jar", "trilead-ssh2-build213-svnkit-1.3-patch.jar", "cglib-nodep-2.2.2.jar", "xmlrpc-common-3.*.jar",
- "axiom*.jar", "axis2*.jar", "antlr*.jar", "XmlSchema*.jar", "json-simple*.jar", "neethi*.jar", "woden*.jar", "xercesImpl*.jar", "xml-apis*.jar", "dom4j*.jar", "javassist*.jar", "commons-fileupload*.jar",
+ "axiom*.jar", "axis2*.jar", "antlr*.jar", "XmlSchema*.jar", "json-simple*.jar", "neethi*.jar", "woden*.jar", "xercesImpl*.jar", "xml-apis*.jar", "dom4j*.jar", "commons-fileupload*.jar",
"xmlrpc-client-3.*.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.45.jar", "jsch-0.1.42.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "mail-1.4.jar", "activation-1.1.jar", "xapi-5.6.100-1-SNAPSHOT.jar"], excl = excludes), cwd=start_path)
#def build_console_proxy ():