Repository: cloudstack Updated Branches: refs/heads/master ef6ec7b27 -> a18d06727
CLOUDSTACK-6892: use lowercase noredist, as package.sh lowercases build type Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a18d0672 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a18d0672 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a18d0672 Branch: refs/heads/master Commit: a18d067278f6b58914dc6a5d44b775ada6cf073e Parents: ef6ec7b Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Thu Nov 13 17:47:30 2014 +0530 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Thu Nov 13 17:48:11 2014 +0530 ---------------------------------------------------------------------- packaging/centos63/cloud.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a18d0672/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index e977e34..072a0b9 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -181,7 +181,7 @@ Group: System Environment/Libraries %description awsapi Apache Cloudstack AWS API compatibility wrapper -%if "%{_ossnoss}" == "NOREDIST" +%if "%{_ossnoss}" == "noredist" %package mysql-ha Summary: Apache CloudStack Balancing Strategy for MySQL Requires: mysql-connector-java @@ -377,7 +377,7 @@ for name in cloud-bridge.properties commons-logging.properties ec2-service.prope done # MYSQL HA -if [ "x%{_ossnoss}" == "xNOREDIST" ] ; then +if [ "x%{_ossnoss}" == "xnoredist" ] ; then mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib cp -r plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib fi @@ -404,7 +404,7 @@ install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsap install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE -if [ "x%{_ossnoss}" == "xNOREDIST" ] ; then +if [ "x%{_ossnoss}" == "xnoredist" ] ; then install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/LICENSE install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/NOTICE fi @@ -697,7 +697,7 @@ fi %{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE %{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE -%if "%{_ossnoss}" == "NOREDIST" +%if "%{_ossnoss}" == "noredist" %files mysql-ha %defattr(0644,cloud,cloud,0755) %attr(0644,root,root) %{_datadir}/%{name}-mysql-ha/lib/*
