From da99f6552c62e032d3c25383ef215751c86dc5c5 Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Sat, 21 Sep 2013 14:42:31 +0800 Subject: [PATCH] Fix the spec file for the noredist build --- INSTALL.md | 2 +- packaging/centos63/cloud.spec | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 47fd2e65493..893f5551e44 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -111,7 +111,7 @@ releases of cloudstack To build all non redistributable components, add the noredist flag to the build command: - $ mvn clean install -P systemvm,developer -Dnonoss + $ mvn clean install -P systemvm,developer -Dnoredist Clear old database (if any) and deploy the database schema: diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 599463e2352..fba2b1a4bc0 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -174,12 +174,12 @@ cp packaging/centos63/replace.properties build/replace.properties echo VERSION=%{_maventag} >> build/replace.properties echo PACKAGE=%{name} >> build/replace.properties -if [ "%{_ossnoss}" == "NONOSS" -o "%{_ossnoss}" == "nonoss" ] ; then - echo "Executing mvn packaging for NONOSS ..." - mvn -Pawsapi,systemvm -Dnonoss package clean install +if [ "%{_ossnoss}" == "NOREDIST" -o "%{_ossnoss}" == "noredist" ] ; then + echo "Executing mvn packaging with non-redistributable libraries ..." + mvn -Pawsapi,systemvm -Dnoredist clean package else - echo "Executing mvn packaging for OSS ..." - mvn -Pawsapi package -Dsystemvm clean install + echo "Executing mvn packaging ..." + mvn -Pawsapi,systemvm clean package fi %install