ktdreyer pushed to rubygem-loofah (master). "Update to loofah 2.0.2 (rhbz#1218819) (..more)"

[notifications at fedoraproject.org]

From 7cf58500b1a6b43b7c448335976486f72fe5afe7 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer at ktdreyer.com>
Date: Mon, 25 May 2015 16:26:02 -0600
Subject: Update to loofah 2.0.2 (rhbz#1218819)

- Drop patch to skip failing test (it works now, with Nokogiri 1.6.6.2)
- Drop Fedora 19 support
- Use %license macro

diff --git a/.gitignore b/.gitignore
index ab8a497..df4d219 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /loofah-1.2.1.gem
 /loofah-2.0.0.gem
 /loofah-2.0.1.gem
+/loofah-2.0.2.gem
diff --git a/rubygem-loofah-1.2.1-skip-test.patch b/rubygem-loofah-1.2.1-skip-test.patch
deleted file mode 100644
index d4491c5..0000000
--- a/rubygem-loofah-1.2.1-skip-test.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 354258fbd2bbaad28792e0bb08a7001dce40688e Mon Sep 17 00:00:00 2001
-From: Ken Dreyer <ktdreyer at ktdreyer.com>
-Date: Thu, 2 Jan 2014 01:43:50 -0700
-Subject: [PATCH] Fedora only: skip failing test
-
----
- test/integration/test_ad_hoc.rb | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/integration/test_ad_hoc.rb b/test/integration/test_ad_hoc.rb
-index 647bb2c..d03dd9e 100644
---- a/test/integration/test_ad_hoc.rb
-+++ b/test/integration/test_ad_hoc.rb
-@@ -142,6 +142,7 @@ mso-bidi-language:#0400;}
-   EOHTML
- 
-   def test_fragment_whitewash_on_microsofty_markup
-+    skip 'https://github.com/flavorjones/loofah/issues/60'
-     whitewashed = Loofah.fragment(MSWORD_HTML).scrub!(:whitewash)
-     assert_equal "<p>Foo <b>BOLD</b></p>", whitewashed.to_s
-   end
--- 
-1.8.3.1
-
diff --git a/rubygem-loofah.spec b/rubygem-loofah.spec
index 7aa0750..4eb33d6 100644
--- a/rubygem-loofah.spec
+++ b/rubygem-loofah.spec
@@ -1,28 +1,25 @@
 %global gem_name loofah
 
 Name: rubygem-%{gem_name}
-Version: 2.0.1
+Version: 2.0.2
 Release: 1%{?dist}
 Summary: Manipulate and transform HTML/XML documents and fragments
 Group: Development/Languages
 License: MIT
 URL: https://github.com/flavorjones/loofah
 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
-%if 0%{?fc19} || 0%{?fc20} || 0%{?el7}
+%if 0%{?fc20} || 0%{?el7}
 Requires: ruby(release)
 Requires: ruby(rubygems)
-Requires: rubygem(nokogiri) >= 1.5.9
+Requires: rubygem(nokogiri) >= 1.6.6.2
 %endif
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
-BuildRequires: rubygem(nokogiri) >= 1.5.9
+BuildRequires: rubygem(nokogiri) >= 1.6.6.2
 BuildRequires: rubygem(minitest)
 BuildRequires: rubygem(rr)
 BuildArch: noarch
-%if 0%{?fc19} || 0%{?fc20} || 0%{?el7}
+%if 0%{?fc20} || 0%{?el7}
 Provides: rubygem(%{gem_name}) = %{version}
 %endif
 
@@ -56,19 +53,14 @@ for f in .gemtest Gemfile Rakefile; do
   sed -i "s|\"$f\",*||g" %{gem_name}.gemspec
 done
 
-# Tests fail with newer libxml.
-# https://github.com/flavorjones/loofah/issues/60
-%patch0 -p 1
-
 %build
-# Create the gem as gem install only works on a gem file
 gem build %{gem_name}.gemspec
 
 %gem_install
 
 %install
 mkdir -p %{buildroot}%{gem_dir}
-cp -pa .%{gem_dir}/* \
+cp -a  .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
 %check
@@ -80,7 +72,8 @@ popd
 
 %files
 %dir %{gem_instdir}
-%doc %{gem_instdir}/MIT-LICENSE.txt
+%{!?_licensedir:%global license %%doc}
+%license %{gem_instdir}/MIT-LICENSE.txt
 %doc %{gem_instdir}/README.rdoc
 %{gem_libdir}
 %exclude %{gem_cache}
@@ -94,6 +87,12 @@ popd
 %exclude %{gem_instdir}/test
 
 %changelog
+* Mon May 25 2015 Ken Dreyer <ktdreyer at ktdreyer.com> - 2.0.2-1
+- Update to loofah 2.0.2 (rhbz#1218819)
+- Drop patch to skip failing test (it works now, with Nokogiri 1.6.6.2)
+- Drop Fedora 19 support
+- Use %%license macro
+
 * Thu Sep 11 2014 Ken Dreyer <ktdreyer at ktdreyer.com> - 2.0.1-1
 - Update to loofah 2.0.1 (RHBZ #1132898)
 - Drop upstreamed RR patch
diff --git a/sources b/sources
index 114f0f7..6ba48ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-73b240863742ebe1d7f785e192e9b231  loofah-2.0.1.gem
+88a4da54c5a88641b6f2f691524527fa  loofah-2.0.2.gem
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/rubygem-loofah.git/commit/?h=master&id=7cf58500b1a6b43b7c448335976486f72fe5afe7