commit 58e94a4c44292dd1f88f5abec2a3de8b4074201b
Author: Elan Ruusamäe <[email protected]>
Date: Thu Jun 2 17:03:32 2016 +0300
xz also optional
fpm.spec | 2 +-
optional-packages.patch | 17 +++++++++++++----
2 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/fpm.spec b/fpm.spec
index 9761933..90b8613 100644
--- 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 653c103..17cdbdc 100644
--- 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|
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fpm.git/commitdiff/58e94a4c44292dd1f88f5abec2a3de8b4074201b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
