AMBARI-1612. parameterizing nagios and ganglia monitoring rpm version. (Ashish Singh via yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1455415 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -458,6 +458,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1612. Parameterizing nagios and ganglia monitoring rpm version.
+ (Ashish Singh via yusaku)
+
  AMBARI-1586. Upgrade of Ambari DB on upgrade to 1.2.2 should restore/keep 
  the configuration data for MAPREDUCE. (Sumit Mohanty via swagle)
 

contrib/addons/package/rpm/create_ganglia_addon_rpm.sh

@@ -27,11 +27,11 @@ if [[ -z "${BUILD_DIR}" ]]; then
 fi
 
 if [[ -z "${VERSION}" ]]; then
-  VERSION="1.2.1.2"
+  VERSION=${VERSION:-1.2.2}
 fi
 
 if [[ -z "${RELEASE}" ]]; then
-  RELEASE="1"
+  RELEASE=${RELEASE:-1}
 fi
 
 #rm -rf ${BUILD_DIR}/*
@@ -60,6 +60,9 @@ mkdir -p ${RPM_BUILDDIR}/SRPMS/
 cp -f ${BASEDIR}/${PKG_NAME}.spec ${RPM_BUILDDIR}/SPECS/
 cp -f ${TAR_DEST} ${RPM_BUILDDIR}/SOURCES/
 
+echo "${VERSION}" > ${RPM_BUILDDIR}/SOURCES/version.txt
+echo "${RELEASE}" > ${RPM_BUILDDIR}/SOURCES/release.txt
+
 cd ${RPM_BUILDDIR}
 
 cmd="rpmbuild --define \"_topdir ${RPM_BUILDDIR}\" \

contrib/addons/package/rpm/create_nagios_addon_rpm.sh

@@ -27,11 +27,11 @@ if [[ -z "${BUILD_DIR}" ]]; then
 fi
 
 if [[ -z "${VERSION}" ]]; then
-  VERSION="1.2.1.2"
+  VERSION=${VERSION:-1.2.2}
 fi
 
 if [[ -z "${RELEASE}" ]]; then
-  RELEASE="1"
+  RELEASE=${RELEASE:-1}
 fi
 
 #rm -rf ${BUILD_DIR}/*
@@ -60,6 +60,9 @@ mkdir -p ${RPM_BUILDDIR}/SRPMS/
 cp -f ${BASEDIR}/${PKG_NAME}.spec ${RPM_BUILDDIR}/SPECS/
 cp -f ${TAR_DEST} ${RPM_BUILDDIR}/SOURCES/
 
+echo "${VERSION}" > ${RPM_BUILDDIR}/SOURCES/version.txt
+echo "${RELEASE}" > ${RPM_BUILDDIR}/SOURCES/release.txt
+
 cd ${RPM_BUILDDIR}
 
 cmd="rpmbuild --define \"_topdir ${RPM_BUILDDIR}\" \

contrib/addons/package/rpm/hdp_mon_ganglia_addons.spec

@@ -22,16 +22,21 @@
 # RPM Spec file for Ganglia Add-ons for HDP Monitoring Dashboard
 #
 
+%define name  hdp_mon_ganglia_addons
+%define release %(cat %{_sourcedir}/release.txt)
+%define version %(cat %{_sourcedir}/version.txt)
+%define buildroot %{_tmppath}/%{name}-%{version}-buildroot
+
+
 Summary: Ganglia Add-ons for HDP Monitoring Dashboard
-Name: hdp_mon_ganglia_addons
-Version: 1.2.1.2
-URL: http://hortonworks.com
-Release: 1
+Name: %{name}
+Version: %{version}
+URL: http://incubator.apache.org/ambari
+Release: %{release}%{?dist}
 License: Apache License, Version 2.0
-Vendor: Hortonworks <ambari-group@hortonworks.com>
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
+Buildroot: %{buildroot}
 Requires: gweb >= 2.2
 
 %if 0%{?suse_version}

contrib/addons/package/rpm/hdp_mon_nagios_addons.spec

@@ -22,17 +22,22 @@
 # RPM Spec file for Nagios Add-ons for HDP Monitoring Dashboard
 #
 
+%define name hdp_mon_nagios_addons
+%define release %(cat %{_sourcedir}/release.txt)
+%define version %(cat %{_sourcedir}/version.txt)
+%define buildroot %{_tmppath}/%{name}-%{version}-buildroot
+
 Summary: Nagios Add-ons for HDP Monitoring Dashboard
-Name: hdp_mon_nagios_addons
-Version: 1.2.1.2
-URL: http://hortonworks.com
-Release: 1
+Name: %{name}
+Version: %{version}
+URL: http://incubator.apache.org/ambari
+Release: %{release}%{?dist}
 License: Apache License, Version 2.0
-Vendor: Hortonworks <ambari-group@hortonworks.com>
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
+Buildroot: %{buildroot}
 Requires: nagios, nagios-plugins, php >= 5
+
 %define nagioshdpscripts_dir %{_prefix}/share/hdp/nagios
 %define nagiosplugin_dir %{_libdir}/nagios/plugins
 %if 0%{?suse_version}