[packages/ruby-ffi-yajl/1.x] up to 1.4.0

[glen]

commit 98b20e55f662556304414ce372b1baf3857f6921
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Oct 2 00:50:35 2018 +0300

    up to 1.4.0

 ruby-ffi-yajl.spec |  6 +++---
 system-yajl.patch  | 11 +++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/ruby-ffi-yajl.spec b/ruby-ffi-yajl.spec
index 0800cf9..bfbbfc6 100644
--- a/ruby-ffi-yajl.spec
+++ b/ruby-ffi-yajl.spec
@@ -8,12 +8,12 @@
 %define	pkgname	ffi-yajl
 Summary:	Ruby FFI wrapper around YAJL 2.x
 Name:		ruby-%{pkgname}
-Version:	1.3.1
-Release:	4
+Version:	1.4.0
+Release:	1
 License:	Apache v2.0
 Group:		Development/Languages
 Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
-# Source0-md5:	ac12c13508dc6df56724a14670d6684a
+# Source0-md5:	b72937c07c91d36ffe224b28e6393cfd
 Patch0:		system-yajl.patch
 URL:		http://github.com/opscode/ffi-yajl
 BuildRequires:	rpm-rubyprov
diff --git a/system-yajl.patch b/system-yajl.patch
index 1f441ed..c1091b7 100644
--- a/system-yajl.patch
+++ b/system-yajl.patch
@@ -25,21 +25,24 @@
  
    class YajlCallbacks < ::FFI::Struct
      layout :yajl_null, :pointer,
---- ruby-ffi-yajl-1.3.1/lib/ffi_yajl/ext.rb	2015-01-22 13:55:11.513182150 +0200
-+++ ruby-ffi-yajl-1.3.1/lib/ffi_yajl/ext.rb	2015-01-22 13:55:53.882526948 +0200
-@@ -3,18 +3,9 @@
+--- ffi-yajl-1.4.0/lib/ffi_yajl/ext.rb~	2018-10-02 00:50:44.000000000 +0300
++++ ffi-yajl-1.4.0/lib/ffi_yajl/ext.rb	2018-10-02 00:51:21.234115347 +0300
+@@ -3,21 +3,12 @@
  require 'ffi_yajl/encoder'
  require 'ffi_yajl/parser'
  require 'ffi'
 -require 'libyajl2'
+ require 'ffi_yajl/platform'
  
  module FFI_Yajl
+   extend FFI_Yajl::Platform
+ 
 -  # FIXME: DRY with ffi_yajl/ffi.rb
 -  # FIXME: extract map_library_name from FFI and stop requiring it at the top level
 -  #        so that the C-library can be installed without FFI
 -  libname = ::FFI.map_library_name("yajl")
 -  # awful windows patch, but there is an open issue to entirely replace FFI.map_library_name already
--  libname = "libyajl.so" if libname == "yajl.dll"
+-  libname = "libyajl.so" if windows?
 -  libpath = File.expand_path(File.join(Libyajl2.opt_path, libname))
 -  libpath.gsub!(/dylib/, 'bundle')
 -  libpath = ::FFI.map_library_name("yajl") unless File.exist?(libpath)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby-ffi-yajl.git/commitdiff/98b20e55f662556304414ce372b1baf3857f6921