You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2012/10/08 04:16:47 UTC
svn commit: r1395437 - in /incubator/ambari/trunk: CHANGES.txt
hmc/package/rpm/SPECS/ambari.spec hmc/package/rpm/hmc-nodep.spec
hmc/package/rpm/hmc-php53.spec
Author: mahadev
Date: Mon Oct 8 02:16:47 2012
New Revision: 1395437
URL: http://svn.apache.org/viewvc?rev=1395437&view=rev
Log:
AMBARI-782. Make RPM package builds honor Ruby's sitelibdir (Jos Backus via mahadev)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/hmc/package/rpm/SPECS/ambari.spec
incubator/ambari/trunk/hmc/package/rpm/hmc-nodep.spec
incubator/ambari/trunk/hmc/package/rpm/hmc-php53.spec
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1395437&r1=1395436&r2=1395437&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Mon Oct 8 02:16:47 2012
@@ -103,6 +103,9 @@ Trunk (unreleased changes)
BUG FIXES
+ AMBARI-782. Make RPM package builds honor Ruby's sitelibdir
+ (Jos Backus via mahadev)
+
AMBARI-701. Ambari does not handle a pre-setup user-supplied Hive Metastore. (hitesh)
AMBARI-690. Monitoring Dashboard - update the RPM version and documentation
Modified: incubator/ambari/trunk/hmc/package/rpm/SPECS/ambari.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/package/rpm/SPECS/ambari.spec?rev=1395437&r1=1395436&r2=1395437&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/package/rpm/SPECS/ambari.spec (original)
+++ incubator/ambari/trunk/hmc/package/rpm/SPECS/ambari.spec Mon Oct 8 02:16:47 2012
@@ -35,6 +35,7 @@ Source1: ambari.init.in
Source3: ambari-agent.init.in
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
Requires: php >= 5, sqlite >= 3, php-pdo, php-pecl-json, php-posix, httpd, puppet = 2.7.9, pdsh, httpd-devel, ruby-devel, rubygems, mod_passenger, mod_ssl
+%{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")}
%define web_prefixdir %{_prefix}/share/hmc
%define httpd_confdir %{_sysconfdir}/httpd/conf.d
%define puppet_master_dir %{_sysconfdir}/puppet/master
@@ -76,7 +77,7 @@ fi
%__rm -rf $RPM_BUILD_ROOT
%__install -D -m0755 "%{SOURCE1}" "$RPM_BUILD_ROOT/etc/init.d/%{name}"
%__install -D -m0755 "%{SOURCE3}" "$RPM_BUILD_ROOT/etc/init.d/%{name}-agent"
-%__mkdir -p $RPM_BUILD_ROOT/usr/lib/ruby/site_ruby/1.8/puppet/reports/
+%__mkdir -p $RPM_BUILD_ROOT/%{ruby_sitelibdir}/puppet/reports/
%__mkdir -p $RPM_BUILD_ROOT/%{web_prefixdir}/
%__mkdir -p $RPM_BUILD_ROOT/%{web_prefixdir}/bin/
%__mkdir -p $RPM_BUILD_ROOT/%{puppet_master_dir}/
@@ -106,7 +107,7 @@ fi
%__mkdir -p $RPM_BUILD_ROOT/%{puppet_master_dir}/modules/catalog/files
%__mkdir -p $RPM_BUILD_ROOT/%{puppet_master_dir}/modules/keytabs/files
%__install -D -m0755 puppet/reports/get_revision $RPM_BUILD_ROOT/%{web_prefixdir}/bin
-%__cp -rf puppet/reports/hmcreport.rb $RPM_BUILD_ROOT/usr/lib/ruby/site_ruby/1.8/puppet/reports/
+%__cp -rf puppet/reports/hmcreport.rb $RPM_BUILD_ROOT/%{ruby_sitelibdir}/puppet/reports/
%post
@@ -160,7 +161,7 @@ rm -rf /var/run/hmc/puppetmaster.boot
%files
%defattr(-,root,root)
%{web_prefixdir}/*
-/usr/lib/ruby/site_ruby/1.8/puppet/reports/hmcreport.rb
+%{ruby_sitelibdir}/puppet/reports/hmcreport.rb
%config /etc/init.d/%{name}
%{hmc_passwd_dir}*
%{puppet_master_dir}/*
Modified: incubator/ambari/trunk/hmc/package/rpm/hmc-nodep.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/package/rpm/hmc-nodep.spec?rev=1395437&r1=1395436&r2=1395437&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/package/rpm/hmc-nodep.spec (original)
+++ incubator/ambari/trunk/hmc/package/rpm/hmc-nodep.spec Mon Oct 8 02:16:47 2012
@@ -34,6 +34,7 @@ Source: hmc-%{version}.tar.gz
Source1: hmc.init.in
BuildRoot: %{_tmppath}/hmc-%{version}-buildroot
Requires: sqlite >= 3, httpd, pdsh, mod_ssl
+%{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")}
%define web_prefixdir %{_prefix}/share/hmc
%define httpd_confdir %{_sysconfdir}/httpd/conf.d
%define puppet_master_dir %{_sysconfdir}/puppet/master
@@ -63,7 +64,7 @@ fi
# Flush any old RPM build root
%__rm -rf $RPM_BUILD_ROOT
%__install -D -m0755 "%{SOURCE1}" "$RPM_BUILD_ROOT/etc/init.d/hmc"
-%__mkdir -p $RPM_BUILD_ROOT/usr/lib/ruby/site_ruby/1.8/puppet/reports/
+%__mkdir -p $RPM_BUILD_ROOT/%{ruby_sitelibdir}/puppet/reports/
%__mkdir -p $RPM_BUILD_ROOT/%{web_prefixdir}/
%__mkdir -p $RPM_BUILD_ROOT/%{web_prefixdir}/bin/
%__mkdir -p $RPM_BUILD_ROOT/%{web_prefixdir}/yum_repo/
@@ -93,7 +94,7 @@ fi
%__mkdir -p $RPM_BUILD_ROOT/%{puppet_master_dir}/modules/catalog/files
%__mkdir -p $RPM_BUILD_ROOT/%{puppet_master_dir}/modules/keytabs/files
%__install -D -m0755 puppet/reports/get_revision $RPM_BUILD_ROOT/%{web_prefixdir}/bin
-%__cp -rf puppet/reports/hmcreport.rb $RPM_BUILD_ROOT/usr/lib/ruby/site_ruby/1.8/puppet/reports/
+%__cp -rf puppet/reports/hmcreport.rb $RPM_BUILD_ROOT/%{ruby_sitelibdir}/puppet/reports/
%post
@@ -141,7 +142,7 @@ rm -rf /var/run/hmc/puppetmaster.boot
%files
%defattr(-,root,root)
%{web_prefixdir}/*
-/usr/lib/ruby/site_ruby/1.8/puppet/reports/hmcreport.rb
+%{ruby_sitelibdir}/puppet/reports/hmcreport.rb
%config /etc/init.d/hmc
%{hmc_passwd_dir}*
%{puppet_master_dir}/*
Modified: incubator/ambari/trunk/hmc/package/rpm/hmc-php53.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/package/rpm/hmc-php53.spec?rev=1395437&r1=1395436&r2=1395437&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/package/rpm/hmc-php53.spec (original)
+++ incubator/ambari/trunk/hmc/package/rpm/hmc-php53.spec Mon Oct 8 02:16:47 2012
@@ -34,6 +34,7 @@ Source: hmc-%{version}.tar.gz
Source1: hmc.init.in
BuildRoot: %{_tmppath}/hmc-%{version}-buildroot
Requires: php53, php53-process, php53-pdo, sqlite >= 3, httpd, puppet = 2.7.9, pdsh, httpd-devel, ruby-devel, rubygems, mod_passenger, mod_ssl
+%{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")}
%define web_prefixdir %{_prefix}/share/hmc
%define httpd_confdir %{_sysconfdir}/httpd/conf.d
%define puppet_master_dir %{_sysconfdir}/puppet/master
@@ -63,7 +64,7 @@ fi
# Flush any old RPM build root
%__rm -rf $RPM_BUILD_ROOT
%__install -D -m0755 "%{SOURCE1}" "$RPM_BUILD_ROOT/etc/init.d/hmc"
-%__mkdir -p $RPM_BUILD_ROOT/usr/lib/ruby/site_ruby/1.8/puppet/reports/
+%__mkdir -p $RPM_BUILD_ROOT/%{ruby_sitelibdir}/puppet/reports/
%__mkdir -p $RPM_BUILD_ROOT/%{web_prefixdir}/
%__mkdir -p $RPM_BUILD_ROOT/%{web_prefixdir}/bin/
%__mkdir -p $RPM_BUILD_ROOT/%{web_prefixdir}/yum_repo/
@@ -93,7 +94,7 @@ fi
%__mkdir -p $RPM_BUILD_ROOT/%{puppet_master_dir}/modules/catalog/files
%__mkdir -p $RPM_BUILD_ROOT/%{puppet_master_dir}/modules/keytabs/files
%__install -D -m0755 puppet/reports/get_revision $RPM_BUILD_ROOT/%{web_prefixdir}/bin
-%__cp -rf puppet/reports/hmcreport.rb $RPM_BUILD_ROOT/usr/lib/ruby/site_ruby/1.8/puppet/reports/
+%__cp -rf puppet/reports/hmcreport.rb $RPM_BUILD_ROOT/%{ruby_sitelibdir}/puppet/reports/
%post
@@ -141,7 +142,7 @@ rm -rf /var/run/hmc/puppetmaster.boot
%files
%defattr(-,root,root)
%{web_prefixdir}/*
-/usr/lib/ruby/site_ruby/1.8/puppet/reports/hmcreport.rb
+%{ruby_sitelibdir}/puppet/reports/hmcreport.rb
%config /etc/init.d/hmc
%{hmc_passwd_dir}*
%{puppet_master_dir}/*