[rubygem-multi_json] Update to MultiJSON 1.10.1.
Vít Ondruch
vondruch at fedoraproject.org
Mon Mar 2 15:27:19 UTC 2015
commit d82f26676de88475c346bffd3bc675b4fe287eee
Author: Vít Ondruch <vondruch at redhat.com>
Date: Mon Mar 2 16:00:48 2015 +0100
Update to MultiJSON 1.10.1.
.gitignore | 1 +
rubygem-multi_json.spec | 25 ++++++++++---------------
sources | 2 +-
3 files changed, 12 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8cdcc1f..fa8c943 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/multi_json-1.7.1.gem
/multi_json-1.7.7.gem
/multi_json-1.8.4.gem
+/multi_json-1.10.1.gem
diff --git a/rubygem-multi_json.spec b/rubygem-multi_json.spec
index 27bfb22..161ed7b 100644
--- a/rubygem-multi_json.spec
+++ b/rubygem-multi_json.spec
@@ -2,23 +2,20 @@
%global gem_name multi_json
Name: rubygem-%{gem_name}
-Version: 1.8.4
-Release: 2%{?dist}
+Version: 1.10.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
-Requires: ruby(release)
-Requires: ruby(rubygems) >= 1.3.6
BuildRequires: ruby(release)
BuildRequires: rubygems-devel >= 1.3.6
-#BuildRequires: ruby
+BuildRequires: ruby
BuildRequires: rubygem(rspec)
#BuildRequires: rubygem(json)
BuildRequires: rubygem(json_pure)
BuildArch: noarch
-Provides: rubygem(%{gem_name}) = %{version}
# OkJson is allowed to be bundled:
# https://fedorahosted.org/fpc/ticket/113
Provides: bundled(okjson) = 43
@@ -36,7 +33,7 @@ Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description doc
-Documentation for %{name}
+Documentation for %{name}.
%prep
@@ -52,11 +49,8 @@ cp -pa .%{gem_dir}/* \
%check
pushd .%{gem_instdir}
-# We don't care about coverage.
-sed -i "/require 'simplecov'/,/end$/{s/^/#/}" spec/spec_helper.rb
-
-## oj is not available on Fedora.
-sed -i '131,158 s/^/#/' spec/multi_json_spec.rb
+# 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.
@@ -68,9 +62,7 @@ rm spec/{gson,jr_jackson,nsjsonserialization,oj,yajl}_adapter_spec.rb
# Adapters have to be tested separately.
for adapter in spec/*_adapter_spec.rb; do
- # Prevents "dump encoding" testsuite error.
- # https://github.com/intridea/multi_json/issues/126
- LANG=en_US.utf8 rspec $adapter || exit
+ rspec $adapter
done
popd
@@ -95,6 +87,9 @@ popd
%changelog
+* Mon Mar 02 2015 Vít Ondruch <vondruch at redhat.com> - 1.10.1-1
+- Update to MultiJSON 1.10.1.
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index c7369f4..8f40f9e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5040903eb3f0c338c4d6b46fdc66ea7a multi_json-1.8.4.gem
+2c7f05f155e936a9f95caa84b9e023c9 multi_json-1.10.1.gem
More information about the scm-commits
mailing list