On Thu, May 01, 2008 at 02:10:42PM -0700, Ian Main
wrote:>
> This patch gets rid of the ruby rails version being specified as 2.0.1.
The Fedora 8 repo now uses 2.0.2 and so any new wui vms being built won't
work. With this patch we can use anything 2.0.1 or above.
>
> This should be applied against tip and 0.4, and new 0.4 rpms should be put
on the ovirt site.
>
> Signed-off-by: Ian Main <imain at redhat.com>
>
> diff --git a/wui/conf/ovirt-wui b/wui/conf/ovirt-wui
> index 07d7acc..f31b32d 100644
> --- a/wui/conf/ovirt-wui
> +++ b/wui/conf/ovirt-wui
> @@ -15,7 +15,6 @@ RAILS_ENVIRONMENT=production
> USER=ovirt
> GROUP=ovirt
> PREFIX=/ovirt
> -export RAILS_GEM_VERSION=2.0.1
>
> RETVAL=0
>
> diff --git a/wui/ovirt-wui.spec b/wui/ovirt-wui.spec
> index 05d915a..f707faa 100644
> --- a/wui/ovirt-wui.spec
> +++ b/wui/ovirt-wui.spec
> @@ -13,7 +13,7 @@ License: GPL and MIT
> Group: Applications/System
> Requires: ruby >= 1.8.1
> Requires: ruby(abi) = 1.8
> -Requires: rubygem(rails) = 2.0.1
> +Requires: rubygem(rails) >= 2.0.1
> Requires: rubygem(mongrel) >= 1.0.1
> Requires: rubygem(kerberos) >= 0.4
> Requires: ruby-gettext-package
> diff --git a/wui/src/config/environment.rb b/wui/src/config/environment.rb
> index 8f69bef..379dcf4 100644
> --- a/wui/src/config/environment.rb
> +++ b/wui/src/config/environment.rb
> @@ -23,10 +23,6 @@
> # you don't control web/app server and can't set it the proper way
> # ENV['RAILS_ENV'] ||= 'production'
>
> -# Specifies gem version of Rails to use when vendor/rails is not present
> -RAILS_GEM_VERSION = ENV['RAILS_GEM_VERSION']
> -RAILS_GEM_VERSION = '2.0.1' unless RAILS_GEM_VERSION
> -
> # Bootstrap the Rails environment, frameworks, and default configuration
> require File.join(File.dirname(__FILE__), 'boot')
>
ACK
Go ahead and commit this, please...
--H