From fd494a66cc4325d182133a413d5b74fbf9faad74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Fri, 14 Jun 2013 17:40:00 +0200
Subject: [PATCH] Update to multi_json 1.7.7.

---
 .gitignore              |  1 +
 rubygem-multi_json.spec | 19 +++++++++++--------
 sources                 |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index c1f5edd..bc37627 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /multi_json-1.0.3.gem
 /multi_json-1.3.6.gem
 /multi_json-1.7.1.gem
+/multi_json-1.7.7.gem
diff --git a/rubygem-multi_json.spec b/rubygem-multi_json.spec
index 4d1fad0..fb93147 100644
--- a/rubygem-multi_json.spec
+++ b/rubygem-multi_json.spec
@@ -4,7 +4,7 @@
 
 Summary: A gem to provide swappable JSON backends
 Name: rubygem-%{gem_name}
-Version: 1.7.1
+Version: 1.7.7
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -22,7 +22,7 @@ BuildArch: noarch
 Provides: rubygem(%{gem_name}) = %{version}
 # OkJson is allowed to be bundled:
 # https://fedorahosted.org/fpc/ticket/113
-Provides: bundled(okjson) = 20110719
+Provides: bundled(okjson) = 42
 
 %description
 A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem,
@@ -53,19 +53,19 @@ cp -a .%{gem_dir}/* \
 %check
 pushd .%{gem_instdir}
 # simplecov gem is not available in Fedora so remove its usage
-sed -i '1,+8 s/^/#/' spec/helper.rb
+sed -i "/require 'simplecov'/,/end$/{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
+sed -i '148,174 s/^/#/' spec/multi_json_spec.rb
+sed -i '/expect(MultiJson.adapter).to eq MultiJson::Adapters::Oj/{s/Oj/JsonGem/}' spec/multi_json_spec.rb
+sed -i 's/oj / /' spec/multi_json_spec.rb
 
 # 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
+# Prevents "dump encoding" testsuite error.
+# https://github.com/intridea/multi_json/issues/126
 LANG=en_US.utf8 rspec spec
 popd
 
@@ -89,6 +89,9 @@ popd
 
 
 %changelog
+* Fri Jun 14 2013 Vít Ondruch <vondruch@redhat.com> - 1.7.7-1
+- Update to multi_json 1.7.7.
+
 * Wed Mar 20 2013 Vít Ondruch <vondruch@redhat.com> - 1.7.1-1
 - Update to multi_json 1.7.1.
 
diff --git a/sources b/sources
index 7853481..4a22fbb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-81c7d5c1024177543cca2e6bffb6aa80  multi_json-1.7.1.gem
+5a4c477d522fe376cead96d855779c73  multi_json-1.7.7.gem