fpm 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 173d3185b39df15876683e91714e7a93970490cc
-  data.tar.gz: 15ffd8f3ff5b2658cd35aeb8b6188d90a00d3f7f
+  metadata.gz: 07da7989aad6ad5467e603091a7e4bf32b7b3c0d
+  data.tar.gz: d57ee3c926610bdb7632e1d47c71dc58b2cec565
 SHA512:
-  metadata.gz: d25c03ef3397d2731d75d97c976a69174caa7b8eed89d8318d561e4516ecf5b4fb47d1f0fe5e96edb26094870b9c27e30d9366e89c3384bc527dea6cfd85c7f6
-  data.tar.gz: e6ee35e8c70e12f88d8350bfb7d5f4e06939d33257fcea64e3f16918f60acb84865c66bd7ac2ee6e6c0dea0ade119e7982256f0e9644ad860c6a8b40936427ca
+  metadata.gz: 0050e0c4bdf76b205c9c76284349916f85e82f4679690bd5d2be77124624f0c5435c29aae1cc761afe36b9f75bace5724941fdb58d6af8adb536272c383bc7e7
+  data.tar.gz: fd3dc776f652d02a5b5f2451bf57c08b1995ef51455bc38c4ef0f3207eb93cb04c5df06bceab33f9a2542dcd23ddebc74590ab20b1547a52a3cd2c3e33b92f8f

data/CHANGELIST

@@ -1,7 +1,13 @@
+1.6.1 (June 10, 2016)
+  - freebsd: Only load xz support if we are doing a freebsd output. (#1132,
+    #1090, Ketan Padegaonkar)
+
 1.6.0 (May 25, 2016)
   - New source: pleaserun. This lets you create packages that will install a
     system service. An after-install script is used in the package to determine
-    which service platform to target (systemd, upstart, etc). (#1119, #1112)
+    which service platform to target (systemd, upstart, etc). Originated from
+    Aaron Mildenstein's work on solving this problem for Logstash. (#1119,
+    #1112)
   - New target: Alpine Linux "apk" packages. (#1054, George Lester)
   - deb: don't append `.conf` to an upstart file if the file name already ends
     in `.conf`. (#1115, josegonzalez)

data/lib/fpm/package/freebsd.rb

@@ -3,7 +3,6 @@ require "fpm/package"
 require "fpm/util"
 require "digest"
 require "fileutils"
-require "xz"
 
 class FPM::Package::FreeBSD < FPM::Package
   SCRIPT_MAP = {
@@ -30,6 +29,10 @@ class FPM::Package::FreeBSD < FPM::Package
          :default => "fpm/<name>"
 
   def output(output_path)
+    # See https://github.com/jordansissel/fpm/issues/1090
+    # require xz later, because this triggers a load of liblzma.so.5 that is
+    # unavailable on older CentOS/RH distros.
+    require "xz"
     output_check(output_path)
 
     # Build the packaging metadata files.

data/lib/fpm/package/rpm.rb

@@ -101,7 +101,7 @@ class FPM::Package::RPM < FPM::Package
   option "--autoprov", :flag, "Enable RPM's AutoProv option"
 
   option "--attr", "ATTRFILE",
-    "Set the attribute for a file (%attr).",
+    "Set the attribute for a file (%attr), e.g. --rpm-attr 750,user1,group1:/some/file",
     :multivalued => true, :attribute_name => :attrs
 
   option "--init", "FILEPATH", "Add FILEPATH as an init script",

data/lib/fpm/rake_task.rb

@@ -14,7 +14,7 @@ class FPM::RakeTask < Rake::TaskLib
     (@source.empty? || @target.empty? || options.name.empty?) &&
       abort("Must specify package name, source and output")
 
-    desc "Package #{@name}" unless ::Rake.application.last_comment
+    desc "Package #{@name}" unless ::Rake.application.last_description
 
     task(options.name) do |_, task_args|
       block.call(*[options, task_args].first(block.arity)) if block_given?

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json