From dc5fb8cce4fbf9bd89281e738c4ccb393d7d4517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Wed, 20 Mar 2013 12:59:24 +0100
Subject: [PATCH] Update to multi_json 1.7.1.

---
 .gitignore              |  1 +
 rubygem-multi_json.spec | 32 +++++++++++++++++++++-----------
 sources                 |  3 +--
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index dbb967f..c1f5edd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /multi_json-1.0.3.gem
 /multi_json-1.3.6.gem
+/multi_json-1.7.1.gem
diff --git a/rubygem-multi_json.spec b/rubygem-multi_json.spec
index 3d2b094..4d1fad0 100644
--- a/rubygem-multi_json.spec
+++ b/rubygem-multi_json.spec
@@ -4,15 +4,14 @@
 
 Summary: A gem to provide swappable JSON backends
 Name: rubygem-%{gem_name}
-Version: 1.3.6
-Release: 4%{?dist}
+Version: 1.7.1
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://github.com/intridea/multi_json
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
 Requires: ruby(release)
 Requires: ruby(rubygems) >= 1.3.6
-Requires: ruby
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel >= 1.3.6
 BuildRequires: ruby
@@ -51,17 +50,23 @@ mkdir -p %{buildroot}%{gem_dir}
 cp -a .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
-# Remove useless shebang.
-sed -i -e '/^#!\/usr\/bin\/env/d' %{buildroot}%{gem_instdir}/Rakefile
-
 %check
-pushd ./%{gem_instdir}
+pushd .%{gem_instdir}
 # simplecov gem is not available in Fedora so remove its usage
-sed -i '10,+3d' spec/helper.rb
+sed -i '1,+8 s/^/#/' spec/helper.rb
+
+# oj is not available on Fedora.
+sed -i '123,131 s/^/#/' spec/multi_json_spec.rb
+sed -i '49,57 s/^/#/' spec/multi_json_spec.rb
+sed -i 's/ oj / /' spec/multi_json_spec.rb
 
-# 1 test case fails and 22 are pending due to missing oj gem on Fedora.
-rspec spec/ | \
-        grep "63 examples, 1 failure, 22 pending"
+# ruby-yajl is not available on Fedora yet.
+# https://bugzilla.redhat.com/show_bug.cgi?id=823351
+sed -i 's/ yajl//' spec/multi_json_spec.rb
+
+# Prevents "invalid byte sequence in US-ASCII" testsuite error.
+# https://github.com/intridea/multi_json/issues/104
+LANG=en_US.utf8 rspec spec
 popd
 
 %files
@@ -76,12 +81,17 @@ popd
 
 %files doc
 %doc %{gem_docdir}
+%doc %{gem_instdir}/CHANGELOG.md
+%doc %{gem_instdir}/CONTRIBUTING.md
 %doc %{gem_instdir}/README.md
 %{gem_instdir}/Rakefile
 %{gem_instdir}/spec
 
 
 %changelog
+* Wed Mar 20 2013 Vít Ondruch <vondruch@redhat.com> - 1.7.1-1
+- Update to multi_json 1.7.1.
+
 * Tue Feb 26 2013 Vít Ondruch <vondruch@redhat.com> - 1.3.6-4
 - Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
 
diff --git a/sources b/sources
index ce08b5e..7853481 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-59cbca421061ecaf85c99b667f2d0623  multi_json-1.0.3.gem
-344cc8470e047250595da068bda4966f  multi_json-1.3.6.gem
+81c7d5c1024177543cca2e6bffb6aa80  multi_json-1.7.1.gem