From d0533b72510d0e8ff1fa9891208ed9dcccb9b776 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Sep 11 2014 16:27:48 +0000
Subject: Update to loofah 2.0.1 (RHBZ #1132898)


- Drop upstreamed RR patch

---

diff --git a/.gitignore b/.gitignore
index 5f6c351..ab8a497 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /loofah-1.2.1.gem
 /loofah-2.0.0.gem
+/loofah-2.0.1.gem
diff --git a/rubygem-loofah-2.0.0-tests-rr.patch b/rubygem-loofah-2.0.0-tests-rr.patch
deleted file mode 100644
index f80dd34..0000000
--- a/rubygem-loofah-2.0.0-tests-rr.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 8c16b393eace237a233ea330b36ec3591a6c3790 Mon Sep 17 00:00:00 2001
-From: Ken Dreyer <ktdreyer@ktdreyer.com>
-Date: Mon, 12 May 2014 13:32:08 -0600
-Subject: [PATCH] tests: load minitest before rr
-
-When running the tests via rake/hoe (for example, with the `rake test`
-command), Rake invokes ruby and loads minitest/autorun before invoking
-the any of the actual test suite files.
-
-On the other hand, when running the tests outside of rake/hoe, the test
-suite's helper.rb loads the RR gem before loading minitest/autorun. This
-ordering causes the test suite to fail because it cannot recognize the
-"mock()" function from RR.
-
-Switch the ordering so that minitest/autorun loads before rr. This
-allows the test suite to pass in both cases.
----
- test/helper.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/helper.rb b/test/helper.rb
-index d21e102..45fee19 100644
---- a/test/helper.rb
-+++ b/test/helper.rb
-@@ -1,8 +1,8 @@
- require 'rubygems'
--require 'rr'
- require 'minitest/unit'
- require 'minitest/spec'
- require 'minitest/autorun'
-+require 'rr'
- 
- require File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "loofah"))
- 
--- 
-1.9.0
-
diff --git a/rubygem-loofah.spec b/rubygem-loofah.spec
index 5a0f5ff..7aa0750 100644
--- a/rubygem-loofah.spec
+++ b/rubygem-loofah.spec
@@ -1,8 +1,8 @@
 %global gem_name loofah
 
 Name: rubygem-%{gem_name}
-Version: 2.0.0
-Release: 2%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
 Summary: Manipulate and transform HTML/XML documents and fragments
 Group: Development/Languages
 License: MIT
@@ -11,9 +11,6 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 # Tests fail with newer libxml.
 # https://github.com/flavorjones/loofah/issues/60
 Patch0: rubygem-loofah-1.2.1-skip-test.patch
-# Tests fail when run outside Rake/Hoe.
-# https://github.com/flavorjones/loofah/pull/74
-Patch1: rubygem-loofah-2.0.0-tests-rr.patch
 %if 0%{?fc19} || 0%{?fc20} || 0%{?el7}
 Requires: ruby(release)
 Requires: ruby(rubygems)
@@ -62,9 +59,6 @@ done
 # Tests fail with newer libxml.
 # https://github.com/flavorjones/loofah/issues/60
 %patch0 -p 1
-# Tests fail when run outside Rake/Hoe.
-# https://github.com/flavorjones/loofah/pull/74
-%patch1 -p 1
 
 %build
 # Create the gem as gem install only works on a gem file
@@ -100,6 +94,10 @@ popd
 %exclude %{gem_instdir}/test
 
 %changelog
+* Thu Sep 11 2014 Ken Dreyer <ktdreyer@ktdreyer.com> - 2.0.1-1
+- Update to loofah 2.0.1 (RHBZ #1132898)
+- Drop upstreamed RR patch
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index b293088..114f0f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f46e7d75b2d6038a69a14c1dca97dfc  loofah-2.0.0.gem
+73b240863742ebe1d7f785e192e9b231  loofah-2.0.1.gem