You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/03/12 07:18:10 UTC
svn commit: r1455415 - in /incubator/ambari/trunk: ./
contrib/addons/package/rpm/
Author: yusaku
Date: Tue Mar 12 06:18:09 2013
New Revision: 1455415
URL: http://svn.apache.org/r1455415
Log:
AMBARI-1612. parameterizing nagios and ganglia monitoring rpm version. (Ashish Singh via yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/contrib/addons/package/rpm/create_ganglia_addon_rpm.sh
incubator/ambari/trunk/contrib/addons/package/rpm/create_nagios_addon_rpm.sh
incubator/ambari/trunk/contrib/addons/package/rpm/hdp_mon_ganglia_addons.spec
incubator/ambari/trunk/contrib/addons/package/rpm/hdp_mon_nagios_addons.spec
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1455415&r1=1455414&r2=1455415&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Mar 12 06:18:09 2013
@@ -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)
Modified: incubator/ambari/trunk/contrib/addons/package/rpm/create_ganglia_addon_rpm.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/contrib/addons/package/rpm/create_ganglia_addon_rpm.sh?rev=1455415&r1=1455414&r2=1455415&view=diff
==============================================================================
--- incubator/ambari/trunk/contrib/addons/package/rpm/create_ganglia_addon_rpm.sh (original)
+++ incubator/ambari/trunk/contrib/addons/package/rpm/create_ganglia_addon_rpm.sh Tue Mar 12 06:18:09 2013
@@ -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}\" \
Modified: incubator/ambari/trunk/contrib/addons/package/rpm/create_nagios_addon_rpm.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/contrib/addons/package/rpm/create_nagios_addon_rpm.sh?rev=1455415&r1=1455414&r2=1455415&view=diff
==============================================================================
--- incubator/ambari/trunk/contrib/addons/package/rpm/create_nagios_addon_rpm.sh (original)
+++ incubator/ambari/trunk/contrib/addons/package/rpm/create_nagios_addon_rpm.sh Tue Mar 12 06:18:09 2013
@@ -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}\" \
Modified: incubator/ambari/trunk/contrib/addons/package/rpm/hdp_mon_ganglia_addons.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/contrib/addons/package/rpm/hdp_mon_ganglia_addons.spec?rev=1455415&r1=1455414&r2=1455415&view=diff
==============================================================================
--- incubator/ambari/trunk/contrib/addons/package/rpm/hdp_mon_ganglia_addons.spec (original)
+++ incubator/ambari/trunk/contrib/addons/package/rpm/hdp_mon_ganglia_addons.spec Tue Mar 12 06:18:09 2013
@@ -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 <am...@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}
Modified: incubator/ambari/trunk/contrib/addons/package/rpm/hdp_mon_nagios_addons.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/contrib/addons/package/rpm/hdp_mon_nagios_addons.spec?rev=1455415&r1=1455414&r2=1455415&view=diff
==============================================================================
--- incubator/ambari/trunk/contrib/addons/package/rpm/hdp_mon_nagios_addons.spec (original)
+++ incubator/ambari/trunk/contrib/addons/package/rpm/hdp_mon_nagios_addons.spec Tue Mar 12 06:18:09 2013
@@ -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 <am...@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}