You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/13 13:21:07 UTC
git commit: updated refs/heads/4.3 to 2aabcc1
Repository: cloudstack
Updated Branches:
refs/heads/4.3 48f595bea -> 2aabcc11d
CLOUDSTACK-6892: use lowercase noredist, as package.sh lowercases build type
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit a18d067278f6b58914dc6a5d44b775ada6cf073e)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2aabcc11
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2aabcc11
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2aabcc11
Branch: refs/heads/4.3
Commit: 2aabcc11d305584dd200427bad13aaf1d46374a4
Parents: 48f595b
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Nov 13 17:47:30 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Nov 13 17:49:57 2014 +0530
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2aabcc11/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index f833190..5bba0d1 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
@@ -356,7 +356,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
@@ -384,7 +384,7 @@ install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsa
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
@@ -669,7 +669,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/*