[PATCH imagefactory-console] update imagefactory-console to work w/ ruby 1.9.3
Michael Orazi
morazi at redhat.com
Wed Feb 8 18:32:56 UTC 2012
----- Original Message -----
> From: mmorsi <mmorsi at redhat.com>
>
> - additionally replacing rspec w/ rspec2
> ---
> Rakefile | 10 ++++------
> rake/rpmtask.rb | 2 +-
> rubygem-imagefactory-console.spec | 7 +++++--
> 3 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/Rakefile b/Rakefile
> index ac1e678..eaf84c1 100644
> --- a/Rakefile
> +++ b/Rakefile
> @@ -24,8 +24,8 @@ require 'rake/clean'
> require 'rake/gempackagetask'
> require 'rake/rdoctask'
> require 'rake/testtask'
> -require 'spec/rake/spectask'
> -require 'rake/rpmtask'
> +require 'rspec/core/rake_task'
> +require './rake/rpmtask'
>
> RPMBUILD_DIR = "#{File.expand_path('~')}/rpmbuild"
> RPM_SPEC = "rubygem-imagefactory-console.spec"
> @@ -64,10 +64,8 @@ Rake::TestTask.new do |t|
> t.test_files = FileList['test/**/*.rb']
> end
>
> -Spec::Rake::SpecTask.new do |t|
> - t.libs << 'lib'
> - t.spec_files = FileList['spec/**/*.rb']
> - t.spec_opts = ['--color', '--format nested']
> +RSpec::Core::RakeTask.new do |t|
> + t.pattern = FileList['spec/**/*.rb']
> end
>
> Rake::RpmTask.new(RPM_SPEC) do |rpm|
> diff --git a/rake/rpmtask.rb b/rake/rpmtask.rb
> index 2f76eca..b0fdea0 100644
> --- a/rake/rpmtask.rb
> +++ b/rake/rpmtask.rb
> @@ -47,7 +47,7 @@ module Rake
> contents.scan(/%define|%global .*\n/).each do |definition|
> words = definition.strip.split(' ')
> key = words[1]
> - value = words[2..-1].to_s
> + value = words[2..-1].first.to_s
> # Modify the contents with expanded values, unless they
> contain
> # a shell command (since we're not modifying them)
> contents.gsub!("%{#{key}}", value) unless
> value.match('%\(')
> diff --git a/rubygem-imagefactory-console.spec
> b/rubygem-imagefactory-console.spec
> index df7694c..c649e72 100644
> --- a/rubygem-imagefactory-console.spec
> +++ b/rubygem-imagefactory-console.spec
> @@ -2,12 +2,12 @@
> %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
> %global gemname imagefactory-console
> %global geminstdir %{gemdir}/gems/%{gemname}-%{version}
> -%global rubyabi 1.8
> +%global rubyabi 1.9.1
>
> Summary: QMF Console for Aeolus Image Factory
> Name: rubygem-%{gemname}
> Version: 0.5.0
> -Release: 4%{?extra_release}%{?dist}
> +Release: 5%{?extra_release}%{?dist}
> Group: Development/Languages
> License: GPLv2+ or Ruby
> URL: http://aeolusproject.org
> @@ -52,6 +52,9 @@ gem install --local --install-dir
> %{buildroot}%{gemdir} \
>
>
> %changelog
> +* Wed Feb 06 2012 Mo Morsi <mmorsi at redhat.com> - 0.5.0-5
> +- updated to ruby 1.9
> +
> * Wed Jul 20 2011 Mo Morsi <mmorsi at redhat.com> - 0.4.0-4
> - renamed packaged to imagefactory-console
>
> --
> 1.7.9
>
>
I think we pulled out the dep from aeolus-all. This package may essentially be orphaned.
m
More information about the aeolus-devel
mailing list