fpm 0.3.10 → 0.3.11

data/lib/fpm/program.rb

@@ -153,7 +153,7 @@ class FPM::Program
     end # --version
 
     opts.on("--iteration ITERATION",
-            "(optional) Set the iteration value for this package.") do |iteration|
+            "(optional) Set the iteration value for this package ('release' for RPM).") do |iteration|
       @settings.iteration = iteration
     end # --iteration
 

data/lib/fpm/source.rb

@@ -142,10 +142,12 @@ class FPM::Source
   end # def tar
 
   def tar_cmd
-    # Rely on gnu tar for solaris.
+    # Rely on gnu tar for solaris and OSX.
     case %x{uname -s}.chomp
     when "SunOS"
       return "gtar"
+    when "Darwin"
+      return "gnutar"
     else
       return "tar"
     end

data/lib/fpm/target/deb.rb

@@ -26,7 +26,12 @@ class FPM::Target::Deb < FPM::Package
   end
 
   def needs_md5sums
-    true
+    case %x{uname -s}.chomp
+    when "Darwin"
+      return false
+    else
+      return true
+    end
   end # def needs_md5sums
 
   def architecture
@@ -72,7 +77,10 @@ class FPM::Target::Deb < FPM::Package
   end
 
   def build!(params)
-    control_files = [ "control", "md5sums" ]
+    control_files = [ "control" ]
+    if File.exists? "./md5sums"
+      control_files << "md5sums"
+    end
 
     # Use custom Debian control file when given ...
     if self.settings[:control]

data/lib/fpm/target/rpm.rb

@@ -28,6 +28,15 @@ class FPM::Target::Rpm < FPM::Package
     end
   end
 
+  def iteration
+    if @iteration.nil? || @iteration.empty?
+      # Default iteration value of 1 makes sense.
+      return '1'
+    else
+      return @iteration
+    end
+  end # def iteration
+
   def version
     if @version.kind_of?(String) and @version.include?("-")
       @logger.info("Package version '#{@version}' includes dashes, converting" \

data/templates/rpm.erb

@@ -59,14 +59,14 @@ Obsoletes: <%= repl %>
 # noop
 
 %build
+# noop
+
+%install
 # some rpm implementations delete the build dir and then recreate it by
 # default, for some reason. Whatever, let's work around it.
 cd $RPM_BUILD_ROOT
 tar -zxf %SOURCE0
 
-%install
-#noop
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 10
-  version: 0.3.10
+  - 11
+  version: 0.3.11
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -14,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-11 00:00:00 -07:00
-default_executable: 
+date: 2011-11-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -25,6 +25,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -77,7 +78,6 @@ files:
 - LICENSE
 - CONTRIBUTORS
 - CHANGELIST
-has_rdoc: true
 homepage: https://github.com/jordansissel/fpm
 licenses: []
 
@@ -92,6 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -100,13 +101,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling