xz also optional

diff --git a/fpm.spec b/fpm.spec
index 9761933cdfba06d842c9b3132ff760c883199ad6..90b861308bf372b7cd89ae7edfb1149dd1683b83 100644 (file)
--- a/fpm.spec
+++ b/fpm.spec
@@ -5,7 +5,7 @@
 Summary:       fpm - package building and mangling
 Name:          fpm
 Version:       1.5.0
-Release:       2
+Release:       3
 License:       MIT-like
 Group:         Development/Languages
 Source0:       https://github.com/jordansissel/fpm/archive/v%{version}/%{name}-%{version}.tar.gz

diff --git a/optional-packages.patch b/optional-packages.patch
index 653c1036eeaa8c71a00573438399d6af022206e6..17cdbdc2ea5157c04b29fcc535c4987d5f136500 100644 (file)
--- a/optional-packages.patch
+++ b/optional-packages.patch
@@ -16,13 +16,22 @@
    spec.add_development_dependency("rspec", "~> 3.0.0") # license: MIT (according to wikipedia)
    spec.add_development_dependency("insist", "~> 1.0.0") # license: Apache 2
    spec.add_development_dependency("pry")
---- fpm-1.5.0/lib/fpm/package/freebsd.rb~      2016-04-13 07:31:03.000000000 +0300
-+++ fpm-1.5.0/lib/fpm/package/freebsd.rb       2016-06-02 17:00:05.884532524 +0300
-@@ -5,7 +5,6 @@
+--- fpm-1.5.0/lib/fpm/package/freebsd.rb       2016-06-02 17:00:05.884532524 +0300
++++ fpm-1.5.0/lib/fpm/package/freebsd.rb       2016-06-02 17:02:43.152633607 +0300
+@@ -4,8 +4,6 @@
+ require "digest"
  require "fileutils"
  require "rubygems/package"
- require "xz"
+-require "xz"
 -require "corefines"
  
  class FPM::Package::FreeBSD < FPM::Package
    SCRIPT_MAP = {
+@@ -88,6 +86,7 @@
+     end
+ 
+     # Create the .txz package archive from the files in staging_path.
++    require "xz"
+     File.open(output_path, "wb") do |file|
+       XZ::StreamWriter.new(file) do |xz|
+         ::Gem::Package::TarWriter.new(xz) do |tar|