rgem2rpm 1.3.2 → 1.3.3

data/conf/template.spec

@@ -7,7 +7,7 @@
 
 %define distnum %{expand:%%(/usr/lib/rpm/redhat/dist.sh --distnum)}
 %define disttype %{expand:%%(/usr/lib/rpm/redhat/dist.sh --disttype)}
-%define name <%=name%>
+%define name <%=prefix_name%>
 %define version <%=version%>
 %define release <%=rpm_release%>.%{disttype}%{distnum}
 
@@ -22,6 +22,7 @@ Prefix: <%=os_install_dir%>
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 <%="BuildArch: noarch" if rpm_no_arch%>
 <%="Requires: #{requires}" unless requires.nil?%>
+<%="Provides: #{provides}" unless provides.nil?%>
 %description
 <%=description%>
 

data/lib/rgem2rpm/converter.rb

@@ -48,10 +48,14 @@ class RGem2Rpm::Converter < Gem::Installer
     "rubygem"
   end
   
+  def prefix_name
+    "#{prefix}-#{name}"
+  end
+  
   # return gem name
   def name
-    name = "#{prefix}-#{@spec.name}"
-    name = "#{name}-#{@spec.platform}" if @spec.platform == 'java'
+    name = @spec.name
+    name = "#{name}_#{@spec.platform}" if @spec.platform.to_s == 'java'
     name
   end
 
@@ -61,7 +65,7 @@ class RGem2Rpm::Converter < Gem::Installer
   end
   
   def full_name
-    "#{name}-#{version}"
+    "#{prefix_name}-#{version}"
   end
 
   # return rpm release
@@ -151,13 +155,18 @@ class RGem2Rpm::Converter < Gem::Installer
   # return gem runtime dependencies
   def requires
     req_str = StringIO.new
-    # set ruby dependency
-    req_str << "ruby #{@spec.required_ruby_version || ">= 0" }"
+    # set ruby dependency for native gems
+    unless @spec.extensions.empty?
+      req_str << "ruby(abi)"
+      req_str << " #{@spec.required_ruby_version}" unless @spec.required_ruby_version.nil?
+    end
     # set rubygems dependency
-    req_str << ", rubygems #{@spec.required_rubygems_version}" unless @spec.required_rubygems_version.nil?
+    req_str << ", " unless req_str.size == 0
+    req_str << "rubygems #{@spec.required_rubygems_version}" unless @spec.required_rubygems_version.nil?
     # set runtime dependencies
     @spec.runtime_dependencies.each { |d|
-      req_str << ", #{prefix}-#{d.name} #{d.requirement.to_s.gsub('~>', '>=')}"
+      req_str << ', ' unless req_str.size == 0 
+      req_str << "#{prefix}-#{d.name} #{d.requirement.to_s.gsub('~>', '>=')}"
       if d.requirement.to_s =~ /~>/
         version = d.requirement.to_s.delete('~>').strip.split('.')
         version[version.size - 1] = "0"
@@ -166,7 +175,15 @@ class RGem2Rpm::Converter < Gem::Installer
       end
     }
     # return string with dependencies
-    return req_str.string
+    req_str.string
+  end
+  
+  # return gem provides clause
+  def provides
+    str = StringIO.new
+    str << "#{prefix}(#{name}) = #{version}"
+    str << ", #{prefix}(#{@spec.name}) = #{version}" if @spec.platform.to_s == 'java'
+    str.string
   end
 
   # return gem description

data/rgem2rpm.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
    s.name = %q{rgem2rpm}
-   s.version = "1.3.2"
+   s.version = "1.3.3"
    s.required_ruby_version = Gem::Requirement.new(">= 1.8.6")
    s.required_rubygems_version = Gem::Requirement.new(">= 1.4.2") if s.respond_to?(:required_rubygems_version=)
-   s.date = %q{2012-01-20}
+   s.date = %q{2012-01-24}
    s.authors = ["Joao Peixoto"]
    s.email = %q{peixoto.joao@gmail.com}
    s.summary = %q{Convert ruby gems into rpm}

metadata

@@ -2,7 +2,7 @@
 name: rgem2rpm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors: 
   - Joao Peixoto
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-20 00:00:00 Z
+date: 2012-01-24 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: minitar