fpm 0.4.17 → 0.4.18

data/CHANGELIST

@@ -1,3 +1,9 @@
+0.4.18 (September 25, 2012)
+  - Fix regression in rpm building where the epoch in was missing in the rpm,
+    but prior fpm versions defaulted it to 1. This caused rpms built with newer
+    fpms to appear "older" than older rpms. Tests added to ensure this regression
+    is caught prior to future releases! (Reported by eliklein)
+
 0.4.17 (September 12, 2012)
   - Remove accidental JSON warning when using '-s python'
 

data/lib/fpm/command.rb

@@ -4,6 +4,7 @@ require "fpm/util"
 require "clamp"
 require "ostruct"
 require "fpm"
+require "tmpdir" # for Dir.tmpdir
 
 if $DEBUG
   Cabin::Channel.get(Kernel).subscribe($stdout)
@@ -170,6 +171,11 @@ class FPM::Command < Clamp::Command
     @template_values << kv.split("=", 2)
   end
 
+  option "--workdir", "WORKDIR",
+    "The directory you want fpm to do its work in, where 'work' is any file" \
+    "copying, downloading, etc. Roughly any scratch space fpm needs to build" \
+    "your package.", :default => Dir.tmpdir
+
   parameter "[ARGS] ...",
     "Inputs to the source package type. For the 'dir' type, this is the files" \
     " and directories you want to include in the package. For others, like " \
@@ -221,6 +227,9 @@ class FPM::Command < Clamp::Command
       args << "."
     end
 
+    @logger.info("Setting workdir", :workdir => workdir)
+    ENV["TMP"] = workdir
+
     validator = Validator.new(self)
     if !validator.ok?
       validator.messages.each do |message|

data/lib/fpm/package/rpm.rb

@@ -214,6 +214,11 @@ class FPM::Package::RPM < FPM::Package
     #return File.join("BUILD", prefix)
   end # def prefix
 
+  # The default epoch value must be 1 (backward compatibility for rpms built
+  # with fpm 0.4.3 and older)
+  def epoch
+    return @epoch || "1"
+  end # def epoch
 
   def to_s(format=nil)
     return super("NAME-VERSION-ITERATION.ARCH.TYPE") if format.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.17
+  version: 0.4.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json