skip optional dependencies

not packaged in pld anyway

diff --git a/fpm.spec b/fpm.spec
index 23ed56ef9990de8cc1e3330438a8258f0e2809ff..f23afb1607a5b38950f4556ff7a8319715023ad0 100644 (file)
--- a/fpm.spec
+++ b/fpm.spec
@@ -15,6 +15,7 @@ Patch0:               templates.patch
 Patch1:                tmppath.patch
 Patch2:                config-attrs.patch
 Patch3:                pld-init.d-dir.patch
+Patch4:                optional-packages.patch
 URL:           https://github.com/jordansissel/fpm
 BuildRequires: rpm-rubyprov
 BuildRequires: rpmbuild(macros) >= 1.665
@@ -45,6 +46,7 @@ wasting pointless hours debugging bad rpm specs!
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %{__sed} -i -e '1 s,#!.*ruby,#!%{__ruby},' bin/*
 
 # replace filesystem_list with pld version

diff --git a/optional-packages.patch b/optional-packages.patch
new file mode 100644 (file)
index 0000000..1ca2f63
--- /dev/null
+++ b/optional-packages.patch
@@ -0,0 +1,18 @@
+--- fpm-1.5.0/fpm.gemspec~     2016-04-13 07:31:03.000000000 +0300
++++ fpm-1.5.0/fpm.gemspec      2016-05-09 16:09:10.124438067 +0300
+@@ -45,15 +45,6 @@
+ 
+   spec.add_development_dependency("rake", "~> 10") # license: MIT
+ 
+-  # For creating tar archives (many packages are just tar archives)
+-  spec.add_dependency("archive-tar-minitar") # license: GPL2+
+-
+-  # For creating FreeBSD package archives (xz-compressed tars)
+-  spec.add_dependency("ruby-xz") # license: MIT
+-
+-  # For backward compatibility with older rubies
+-  spec.add_dependency("corefines", "~>1.9") # license: MIT
+-
+   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")