From 21527e09ae1a4fe0e68efec105b01cb2edc72f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 12 Oct 2016 17:31:28 +0200 Subject: [PATCH] Update to MultiJSON 1.12.1. --- .gitignore | 2 ++ rubygem-multi_json.spec | 32 +++++++++++++++++--------------- sources | 3 ++- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index fa8c943..bcfe8fd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /multi_json-1.7.7.gem /multi_json-1.8.4.gem /multi_json-1.10.1.gem +/multi_json-1.12.1-tests.tgz +/multi_json-1.12.1.gem diff --git a/rubygem-multi_json.spec b/rubygem-multi_json.spec index 537c901..329b9d9 100644 --- a/rubygem-multi_json.spec +++ b/rubygem-multi_json.spec @@ -2,23 +2,25 @@ %global gem_name multi_json Name: rubygem-%{gem_name} -Version: 1.10.1 -Release: 3%{?dist} +Version: 1.12.1 +Release: 1%{?dist} Summary: A common interface to multiple JSON libraries Group: Development/Languages License: MIT URL: http://github.com/intridea/multi_json Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +# git clone https://github.com/intridea/multi_json.git && cd multi_json +# git checkout v1.12.1 && tar czvf multi_json-1.12.1-tests.tgz ./spec/ +Source1: %{gem_name}-%{version}-tests.tgz BuildRequires: ruby(release) -BuildRequires: rubygems-devel >= 1.3.6 +BuildRequires: rubygems-devel >= 1.3.5 BuildRequires: ruby BuildRequires: rubygem(rspec) -#BuildRequires: rubygem(json) BuildRequires: rubygem(json_pure) BuildArch: noarch # OkJson is allowed to be bundled: # https://fedorahosted.org/fpc/ticket/113 -Provides: bundled(okjson) = 43 +Provides: bundled(okjson) = 45 %description A common interface to multiple JSON libraries, including Oj, Yajl, the JSON @@ -44,21 +46,23 @@ Documentation for %{name}. %install mkdir -p %{buildroot}%{gem_dir} -cp -pa .%{gem_dir}/* \ +cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ %check pushd .%{gem_instdir} +tar xf %{SOURCE1} + # oj is not available on Fedora. sed -i '139,164 s/^/#/' spec/multi_json_spec.rb sed -i "/expect(MultiJson.adapter.to_s).to eq('MultiJson::Adapters::Oj')/ s/Oj/JsonGem/" spec/multi_json_spec.rb # Execute main test suite. -rspec spec/multi_json_spec.rb +rspec spec/{multi_json,options_cache}_spec.rb # Disable test of engines unsupported on Fedora (they may cause test suite to # exit). -rm spec/{gson,jr_jackson,nsjsonserialization,oj,yajl}_adapter_spec.rb +rm spec/{oj,yajl}_adapter_spec.rb # Adapters have to be tested separately. for adapter in spec/*_adapter_spec.rb; do @@ -69,10 +73,7 @@ popd %files %dir %{gem_instdir} -%exclude %{gem_instdir}/.* -%exclude %{gem_instdir}/Gemfile -%exclude %{gem_instdir}/%{gem_name}.gemspec -%doc %{gem_instdir}/LICENSE.md +%license %{gem_instdir}/LICENSE.md %{gem_libdir} %exclude %{gem_cache} %{gem_spec} @@ -82,11 +83,12 @@ popd %doc %{gem_instdir}/CHANGELOG.md %doc %{gem_instdir}/CONTRIBUTING.md %doc %{gem_instdir}/README.md -%{gem_instdir}/Rakefile -%{gem_instdir}/spec - +%{gem_instdir}/multi_json.gemspec %changelog +* Wed Oct 12 2016 Vít Ondruch - 1.12.1-1 +- Update to MultiJSON 1.12.1. + * Thu Feb 04 2016 Fedora Release Engineering - 1.10.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 8f40f9e..aea8331 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -2c7f05f155e936a9f95caa84b9e023c9 multi_json-1.10.1.gem +c1725e9955a21fc8d813a71481300cf6 multi_json-1.12.1-tests.tgz +7748bcf54c2b1a7034b69f36729a506b multi_json-1.12.1.gem