up to 0.9.2

diff --git a/gem2rpm.spec b/gem2rpm.spec
index 03581e031a825aa08fe1ab9ea88e9524b6e78192..104b82f7ad07c3459bc4cad919dad805aeab4024 100644 (file)
--- a/gem2rpm.spec
+++ b/gem2rpm.spec
@@ -1,14 +1,14 @@
 Summary:       Generate rpm specfiles from gems
 Name:          gem2rpm
-Version:       0.8.1
-Release:       0.7
+Version:       0.9.2
+Release:       0.8
 License:       GPL v2+
 Group:         Development/Languages
 Source0:       http://rubygems.org/gems/%{name}-%{version}.gem
-# Source0-md5: d3c9416f225ae944fd195e69e122d46e
+# Source0-md5: 6988e28332369a79067d45b8c61f2851
 # git clone https://github.com/lutter/gem2rpm.git && cd gem2rpm && git checkout v0.8.1
 # tar czvf gem2rpm-0.8.1-tests.tgz test/
-Source1:       %{name}-%{version}-tests.tgz
+Source1:       %{name}-0.8.1-tests.tgz
 # Source1-md5: d7d8bc231dc405bbce00f570c89f530e
 Source2:       pld.spec.erb
 Patch0:                gems.patch

diff --git a/gems.patch b/gems.patch
index 206fced434d94c76b49d801d6e4447cd3011a14a..67c418ec731c506570612977e8f9cbb54c31dbe5 100644 (file)
--- a/gems.patch
+++ b/gems.patch
@@ -1,9 +1,9 @@
---- gem2rpm-0.8.1/lib/gem2rpm.rb~      2013-04-14 16:00:00.000000000 +0300
-+++ gem2rpm-0.8.1/lib/gem2rpm.rb       2013-04-14 16:00:28.916832649 +0300
+--- gem2rpm-0.9.2/lib/gem2rpm.rb~      2013-04-29 23:19:15.000000000 +0300
++++ gem2rpm-0.9.2/lib/gem2rpm.rb       2013-04-29 23:40:45.877153630 +0300
 @@ -1,5 +1,6 @@
  require 'erb'
  require 'socket'
 +require 'rubygems'
- require 'rubygems/format'
+ require 'gem2rpm/package'
  require 'gem2rpm/distro'
- require 'gem2rpm/specification'
+ require 'gem2rpm/format'

diff --git a/pld.spec.erb b/pld.spec.erb
index ae15901fa437ee4d9534ce59b38f47663019d81d..37515db028b86cec8d017890f49035d708d84200 100644 (file)
--- a/pld.spec.erb
+++ b/pld.spec.erb
@@ -3,17 +3,20 @@ Summary:      <%= spec.summary %>
 Name:          ruby-%{pkgname}
 Version:       <%= spec.version %>
 Release:       0.1
-License:       Distributable
+License:       <%= spec.licenses.empty? ? "GPL v2+ or Ruby" : spec.licenses.join(", ") %>
 Group:         Development/Languages
 Source0:       http://rubygems.org/downloads/%{pkgname}-%{version}.gem
 # Source0-md5: -
 URL:           <%= spec.homepage %>
 BuildRequires: rpm-rubyprov
 BuildRequires: rpmbuild(macros) >= 1.656
+<% if ! spec.extensions.empty? -%>
+BuildRequires: ruby-devel
+<% end -%>
 <% if ! spec.executables.empty? -%>
 BuildRequires: sed >= 4.0
 <% end -%>
-<% for d in spec.dependencies -%>
+<% for d in spec.runtime_dependencies -%>
 <% for req in d.requirement -%>
 Requires:      ruby-<%= d.name %> <%= req %>
 <% end -%>

diff --git a/style.patch b/style.patch
index af761780bb9f428a62ae7259545711116cbc662e..17748ac9ae3864976675fb8f04e801f383e706af 100644 (file)
--- a/style.patch
+++ b/style.patch
@@ -1,11 +1,11 @@
---- gem2rpm-0.8.1/lib/gem2rpm/helpers.rb~      2013-04-29 22:57:16.000000000 +0300
-+++ gem2rpm-0.8.1/lib/gem2rpm/helpers.rb       2013-04-29 23:13:01.409116757 +0300
-@@ -12,7 +12,7 @@
-       requirements.inject([]) do |output, r|
-         if r.first == '~>'
-         next_version = Gem::Version.create(r.last).bump
--        output << ['=>', r.last]
-+        output << ['>=', r.last]
-         output << ['<', next_version]
-       else
-         output << r
+--- gem2rpm-0.9.2/lib/gem2rpm/helpers.rb~      2013-04-29 23:19:15.000000000 +0300
++++ gem2rpm-0.9.2/lib/gem2rpm/helpers.rb       2013-04-29 23:24:07.509077652 +0300
+@@ -24,7 +24,7 @@
+     # '<' pair.
+     def self.expand_pessimistic_requirement(requirement)
+       next_version = Gem::Version.create(requirement.last).bump
+-      return ['=>', requirement.last], ['<', next_version]
++      return ['>=', requirement.last], ['<', next_version]
+     end
+ 
+     # Expands the not equal version operator '!=' into equivalent '<' and