[packages/fpm] - up to 1.10.1 - relax json deps for ruby 2.4

[baggins]

commit 7ba9fb890ea8ef08b58788b48388ae9cd4a31b21
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jul 12 22:45:06 2018 +0200

    - up to 1.10.1
    - relax json deps for ruby 2.4

 fpm.spec                |  8 +++++---
 optional-packages.patch | 22 +++++++---------------
 relax-deps.patch        | 11 +++++++++++
 3 files changed, 23 insertions(+), 18 deletions(-)
---
diff --git a/fpm.spec b/fpm.spec
index 88d6614..e41cbd0 100644
--- a/fpm.spec
+++ b/fpm.spec
@@ -4,18 +4,19 @@
 
 Summary:	fpm - package building and mangling
 Name:		fpm
-Version:	1.8.1
-Release:	2
+Version:	1.10.1
+Release:	1
 License:	MIT-like
 Group:		Development/Languages
 Source0:	https://github.com/jordansissel/fpm/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	bac8217c5038ce2b144595fc62ca2dd9
+# Source0-md5:	5b11d2d3489abf1e1b43a0f134ae9bc9
 Source1:	filesystem_list
 Patch0:		templates.patch
 Patch1:		tmppath.patch
 Patch2:		config-attrs.patch
 Patch3:		pld-init.d-dir.patch
 Patch4:		optional-packages.patch
+Patch5:		relax-deps.patch
 URL:		https://github.com/jordansissel/fpm
 BuildRequires:	rpm-rubyprov
 BuildRequires:	rpmbuild(macros) >= 1.665
@@ -47,6 +48,7 @@ wasting pointless hours debugging bad rpm specs!
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -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
index db4ba50..c7b7433 100644
--- a/optional-packages.patch
+++ b/optional-packages.patch
@@ -1,23 +1,15 @@
---- fpm-1.8.1/fpm.gemspec	2017-06-18 18:35:09.062502240 +0300
+--- fpm-1.8.1/fpm.gemspec~	2017-06-18 18:35:09.062502240 +0300
 +++ fpm-1.8.1/fpm.gemspec	2017-06-20 19:35:03.759375133 +0300
-@@ -47,19 +47,10 @@
+@@ -47,12 +47,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", "0.5.2") # license: GPL2+
--
 -  # For creating FreeBSD package archives (xz-compressed tars)
--  spec.add_dependency("ruby-xz") # license: MIT
+-  spec.add_dependency("ruby-xz", "~> 0.2.3") # license: MIT
 -
--  # For sourcing from pleaserun 
--  spec.add_dependency("pleaserun", "~> 0.0.24") # license: Apache 2
+-  # For sourcing from pleaserun
+-  spec.add_dependency("pleaserun", "~> 0.0.29") # license: Apache 2
 -
-   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")
--  spec.add_development_dependency("stud")
-+  spec.add_dependency("stud")
+   spec.add_dependency("stud")
  
-   spec.files = files
-   spec.require_paths << "lib"
+   spec.add_development_dependency("rspec", "~> 3.0.0") # license: MIT (according to wikipedia)
diff --git a/relax-deps.patch b/relax-deps.patch
new file mode 100644
index 0000000..734ed70
--- /dev/null
+++ b/relax-deps.patch
@@ -0,0 +1,11 @@
+--- fpm-1.10.1/fpm.gemspec~	2018-07-12 22:41:07.000000000 +0200
++++ fpm-1.10.1/fpm.gemspec	2018-07-12 22:44:01.292656076 +0200
+@@ -24,7 +24,7 @@
+ 
+   # For parsing JSON (required for some Python support, etc)
+   # http://flori.github.com/json/doc/index.html
+-  spec.add_dependency("json", ">= 1.7.7", "< 2.0") # license: Ruby License
++  spec.add_dependency("json", ">= 1.7.7") # license: Ruby License
+ 
+   # For logging
+   # https://github.com/jordansissel/ruby-cabin
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fpm.git/commitdiff/7ba9fb890ea8ef08b58788b48388ae9cd4a31b21