rpms/ace/F-9 ace.spec,1.1,1.2

[Bryan Kearney]

Author: bkearney

Update of /cvs/pkgs/rpms/ace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13285

Modified Files:
	ace.spec 
Log Message:
Pull in the latest



Index: ace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ace/F-9/ace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ace.spec	25 Nov 2008 20:01:45 -0000	1.1
+++ ace.spec	2 Dec 2008 21:27:58 -0000	1.2
@@ -1,4 +1,4 @@
-%define ruby_sitelibdir %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 %define	pbuild 			%{_builddir}/%{name}-%{version}
 %define binFile 		%{_bindir}/ace
 %define initFile 		%{_initrddir}/ace
@@ -12,7 +12,7 @@
 Summary: 			Appliance Configuration Engine
 Name: 				ace
 Version: 			0.0.3
-Release: 			5%{?dist}
+Release: 			7%{?dist}
 
 Group: 				Applications/Internet
 License: 			LGPLv2+
@@ -20,6 +20,9 @@
 Source0: 			%{url}/download/%{name}-%{version}.tar.gz
 BuildRoot: 			%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 			noarch
+BuildRequires:			ruby(abi) = 1.8
+BuildRequires:  		ruby-devel >=  1.8
+BuildRequires:  		ruby
 Requires: 			yum
 Requires:			ruby(abi) = 1.8
 Requires: 			puppet
@@ -33,7 +36,7 @@
 
 %files
 %defattr(-,root,root,-)
-%dir %{ruby_sitelibdir}
+%dir %{ruby_sitelib}
 %dir %{modulehome}/appliance_base
 %dir %{modulehome}/augeas
 %dir %{modulehome}/firewall
@@ -48,7 +51,7 @@
 %{acehome}/lenses/*
 %{acehome}/manifests/*
 %{acehome}/tools/*
-%{ruby_sitelibdir}/*
+%{ruby_sitelib}/*
 %doc %{acehome}/COPYING
 %{binFile}
 %{initFile}
@@ -206,12 +209,12 @@
 %install
 rm -rf %{buildroot}
 install -d %{buildroot}/%{acehome}
-install -d %{buildroot}/%{ruby_sitelibdir}
+install -d %{buildroot}/%{ruby_sitelib}
 install -d %{buildroot}/%{_bindir}
 install -d %{buildroot}/%{_initrddir}
 cp -pr %{pbuild}/COPYING %{buildroot}/%{acehome}
-cp -pr %{pbuild}/lib/ace.rb %{buildroot}/%{ruby_sitelibdir}
-cp -pr %{pbuild}/lib/ace %{buildroot}/%{ruby_sitelibdir}
+cp -pr %{pbuild}/lib/ace.rb %{buildroot}/%{ruby_sitelib}
+cp -pr %{pbuild}/lib/ace %{buildroot}/%{ruby_sitelib}
 cp -pr %{pbuild}/bin/ace %{buildroot}/%{binFile}
 cp -pr %{pbuild}/bin/ace-init %{buildroot}/%{initFile}
 cp -pr %{pbuild}/modules %{buildroot}/%{acehome}
@@ -244,6 +247,12 @@
 # Changelog
 ###########
 %changelog
+* Tue Dec 2 2008 Bryan Kearney <bkearney at redhat.com> 0.0.3-7
+- Modify the build requires to include the ruby binary
+
+* Tue Dec 2 2008 Bryan Kearney <bkearney at redhat.com> 0.0.3-6
+- Modify the build requires to get the sitelibdir value
+
 * Thu Oct 2 2008 Bryan Kearney <bkearney at redhat.com> 0.0.3-5
 - Remove the console to package it later.