[ambari] enable vendor scripts (FPC #415 exception granted)

Peter MacKinnon pmackinn at fedoraproject.org
Tue Apr 22 15:20:25 UTC 2014


commit e3c01bae518a1df4297c5a00f4391d3fda9e8adc
Author: Peter MacKinnon <pmackinn at redhat.com>
Date:   Tue Apr 22 11:20:04 2014 -0400

    enable vendor scripts (FPC #415 exception granted)

 ambari.spec |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/ambari.spec b/ambari.spec
index 9fb47c3..e1a1841 100644
--- a/ambari.spec
+++ b/ambari.spec
@@ -2,13 +2,12 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 %bcond_with agent
-%bcond_with vendor_scripts
 
 %global hdp_build 23
 
 Name:           ambari
 Version:        1.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Apache Hadoop cluster management
 
 License:        ASL 2.0 and MS-PL and MIT
@@ -267,11 +266,6 @@ install -p src/main/python/ambari-server.py %{buildroot}%{_datadir}/%{name}/amba
 chmod +x src/main/python/os_type_check.sh
 cp -p src/main/python/{bootstrap.py,setupAgent.py,os_type_check.sh} %{buildroot}%{python_sitelib}/ambari_server
 
-# TODO: this static content currently contains bundled javascript libraries 
-%if %{without vendor_scripts}
-rm -fr ../ambari-web/public-static/javascripts/vendor*
-%endif
-
 # zero-length file
 rm ../ambari-web/public-static/data/apps/jobs.json
 rm -fr ../ambari-web/public-static/font/*
@@ -343,6 +337,9 @@ cp -p version %{buildroot}%{_var}/lib/ambari-server/resources
 %doc NOTICE.txt LICENSE.txt
 
 %changelog
+* Tue Apr 22 2014 Peter MacKinnon <pmackinn at redhat.com> 1.4.4-2
+- enable vendor scripts (FPC #415 exception granted)
+
 * Sat Feb 22 2014 Peter MacKinnon <pmackinn at redhat.com> 1.4.4-1
 - Initial RPM
 - rpmlint fixes


More information about the scm-commits mailing list