[PATCH aeolus-image] Fix up packaging

Steve Linabery slinaber at redhat.com
Tue Aug 7 21:26:04 UTC 2012


On Tue, Aug 07, 2012 at 03:14:44PM -0400, Jason Guiditta wrote:
> We had some bad versions of deps (too tight restrictions), and
> differences between gemspec in Rakefile and gemspec, which now match.
> Really we should just have the gemspec, but given this is likely the
> last major release of this gem, it does not seem worth the effort at
> this time.
> ---
>  Rakefile                     |   29 ++++++++++++++++-------------
>  aeolus-image.gemspec         |   28 +++++++++++++++-------------
>  rubygem-aeolus-image.spec.in |    4 ++++
>  3 files changed, 35 insertions(+), 26 deletions(-)
> 
> diff --git a/Rakefile b/Rakefile
> index 0c7d664..7d6e400 100644
> --- a/Rakefile
> +++ b/Rakefile
> @@ -27,22 +27,25 @@ RPM_SPEC_IN = "rubygem-aeolus-image.spec.in"
>  PKG_VERSION = "0.6.0"
>  
>  spec = Gem::Specification.new do |s|
> -  s.name = 'aeolus-image'
> -  s.version = PKG_VERSION
> -  s.summary= 'Ruby Client for Image Warehouse and Image Factory for the Aeolus cloud suite'
> -  s.description = 'Library for managing image via the Factory and Warehouse projects for the aeolus cloud management suite'
> -  s.author = 'Jason Guiditta, Martyn Taylor'
> -  s.email = 'jguiditt at redhat.com, mtaylor at redhat.com'
> -  s.license = 'ASL 2.0'
> -  s.homepage = 'http://aeolusproject.org'
> -  s.files = %w(Rakefile) + Dir.glob("{lib,spec}/**/*") + %w(COPYING)
> +  s.name         = 'aeolus-image'
> +  s.version      = PKG_VERSION
> +  s.platform     = Gem::Platform::RUBY
> +  s.authors      = 'Jason Guiditta, Martyn Taylor'
> +  s.email        = 'jguiditt at redhat.com, mtaylor at redhat.com'
> +  s.license      = 'ASL 2.0'
> +  s.homepage     = "https://github.com/aeolusproject/aeolus-image-rubygem"
> +  s.summary      = 'Ruby Client for Image Warehouse and Image Factory for the Aeolus cloud suite'
> +  s.description  = "aeolus-image is a Ruby library used by Conductor to connect with Image Factory and Image Warehouse."
> +
> +  s.files        = Dir["lib/**/*.rb","README.md","COPYING","Rakefile","rake/rpmtask.rb"]
> +  s.test_files   = Dir["spec/**/*.*",".rspec","examples/aeolus-cli"]
>    s.require_path = "lib"
> -  s.add_dependency('nokogiri', '>=0.4.0')
> -  s.add_dependency('rest-client')
> -  s.add_dependency('activeresource', '~>3.0.10')
> +  s.add_dependency('activeresource')
> +  s.add_dependency('nokogiri')
>    s.add_dependency('oauth')
> +  s.add_dependency('rest-client')
>  
> -  s.add_development_dependency('rspec', '~>1.3.0')
> +  s.add_development_dependency('rspec', '>=1.3.0')
>  end
>  
>  Gem::PackageTask.new(spec) do |p|
> diff --git a/aeolus-image.gemspec b/aeolus-image.gemspec
> index 3345e7e..f35dcab 100644
> --- a/aeolus-image.gemspec
> +++ b/aeolus-image.gemspec
> @@ -1,19 +1,21 @@
>  Gem::Specification.new do |s|
> -  s.name        = "aeolus-image"
> -  s.version     = "0.5.0"
> -  s.platform    = Gem::Platform::RUBY
> -  s.authors     = ["Red Hat Inc."]
> -  s.email       = ["aeolus-devel at lists.fedorahosted.org"]
> -  s.homepage    = "https://github.com/aeolusproject/aeolus-image-rubygem"
> -  s.summary     = "Ruby library used by Conductor"
> -  s.description = "aeolus-image-rubygem is a Ruby library used by Conductor to connect with Image Factory and Image Warehouse."
> +  s.name         = "aeolus-image"
> +  s.version      = "0.6.0"
> +  s.platform     = Gem::Platform::RUBY
> +  s.authors      = ["Jason Guiditta, Martyn Taylor"]
> +  s.email        = ["jguiditt at redhat.com, mtaylor at redhat.com"]
> +  s.license      = "ASL 2.0"
> +  s.homepage     = "https://github.com/aeolusproject/aeolus-image-rubygem"
> +  s.summary      = "Ruby Client for Image Warehouse and Image Factory for the Aeolus cloud suite"
> +  s.description  = "aeolus-image is a Ruby library used by Conductor to connect with Image Factory and Image Warehouse."
>  
> -  s.add_dependency "oauth"
> +  s.files        = Dir["lib/**/*.rb","README.md","COPYING","Rakefile","rake/rpmtask.rb"]
> +  s.test_files   = Dir["spec/**/*.*",".rspec","examples/aeolus-cli"]
> +  s.require_path = 'lib'
>    s.add_dependency "activeresource"
> -  s.add_dependency "rest-client"
>    s.add_dependency "nokogiri"
> +  s.add_dependency "oauth"
> +  s.add_dependency "rest-client"
>  
> -  # If you need to check in files that aren't .rb files, add them here
> -  s.files        = Dir["{lib}/**/*.rb", "COPYING", "*.md"]
> -  s.require_path = 'lib'
> +  s.add_development_dependency('rspec', '>=1.3.0')
>  end
> diff --git a/rubygem-aeolus-image.spec.in b/rubygem-aeolus-image.spec.in
> index f6db1e9..1e0513e 100644
> --- a/rubygem-aeolus-image.spec.in
> +++ b/rubygem-aeolus-image.spec.in
> @@ -57,11 +57,15 @@ rm -rf %{buildroot}%{gemdir}/gems/%{gemname}-%{version}/.yardoc
>  
>  %files
>  %doc %{geminstdir}/COPYING
> +%doc %{geminstdir}/README.md
>  %doc %{gemdir}/doc/%{gemname}-%{version}
>  %dir %{geminstdir}
>  %{geminstdir}/Rakefile
>  %{geminstdir}/lib
> +%{geminstdir}/rake/rpmtask.rb
> +%{geminstdir}/.rspec
>  %{geminstdir}/spec
> +%{geminstdir}/examples
>  %{gemdir}/cache/%{gemname}-%{version}.gem
>  %{gemdir}/specifications/%{gemname}-%{version}.gemspec
>  
> -- 
> 1.7.7.6
> 

OK, this is pushed, and I also pushed changes to the 0.5.x branch. (Not the very same changes, mind you).

So we should be able to create a gem from the v0.5.1-1 tag now.

hth
s|e



More information about the aeolus-devel mailing list