CLOUDSTACK-6892: use lowercase noredist, as package.sh lowercases build type
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
(cherry picked from commit a18d067278f6b58914dc6a5d44b775ada6cf073e)
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
Conflicts:
packaging/centos63/cloud.spec
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7a8ac879
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7a8ac879
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7a8ac879
Branch: refs/heads/4.4
Commit: 7a8ac87907c627fbbdc8e410c6cc96714e22baf3
Parents: 832fd72
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 Dec 11 20:03:28 2014 +0530
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a8ac879/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 6527645..3196d9d 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -178,7 +178,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
@@ -354,7 +354,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
@@ -381,7 +381,8 @@ 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
@@ -668,7 +669,7 @@ fi
%files baremetal-agent
%attr(0755,root,root) %{_bindir}/cloudstack-setup-baremetal
-%if "%{_ossnoss}" == "NOREDIST"
+%if "%{_ossnoss}" == "noredist"
%files mysql-ha
%defattr(0644,cloud,cloud,0755)
%attr(0644,root,root) %{_datadir}/%{name}-mysql-ha/lib/*
