Update to sitemap_generator 6.0.0.HEADmaster

1 files changed, 19 insertions, 12 deletions

diff --git a/rubygem-sitemap_generator.spec b/rubygem-sitemap_generator.spec
index 5ce87f8..cb48fd7 100644
--- a/rubygem-sitemap_generator.spec
+++ b/rubygem-sitemap_generator.spec
@@ -2,29 +2,26 @@
 %global gem_name sitemap_generator
 
 Name: rubygem-%{gem_name}
-Version: 5.3.1
+Version: 6.0.0
 Release: 1%{?dist}
 Summary: Easily generate XML Sitemaps
 License: MIT
 URL: http://github.com/kjvarga/sitemap_generator
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 # git clone https://github.com/kjvarga/sitemap_generator.git && cd sitemap_generator
-# git checkout v5.3.1 && tar czvf sitemap_generator-5.3.1-specs.tar.gz spec/
+# git checkout v6.0.0 && tar czvf sitemap_generator-6.0.0-specs.tar.gz spec/
 Source1: %{gem_name}-%{version}-specs.tar.gz
-Source2: https://raw.githubusercontent.com/kjvarga/sitemap_generator/v5.3.1/config/sitemap.rb
-# Fix compatibility with Ruby 2.0.0+.
-# https://github.com/kjvarga/sitemap_generator/pull/291
-Patch0: rubygem-sitemap_generator-5.3.1-Fix-Ruby-2.0.0-compatibility.patch
+Source2: https://raw.githubusercontent.com/kjvarga/sitemap_generator/v6.0.0/config/sitemap.rb
 Requires: rubygem(bigdecimal)
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby
 BuildRequires: rubygem(bigdecimal)
 BuildRequires: rubygem(builder)
-BuildRequires: rubygem(fog-aws) >= 1.2
-BuildRequires: rubygem(nokogiri) >= 1.6
-BuildRequires: rubygem(rspec) >= 3.5
-BuildRequires: rubygem(webmock) >= 2.3
+BuildRequires: rubygem(fog-aws)
+BuildRequires: rubygem(nokogiri)
+BuildRequires: rubygem(rspec)
+BuildRequires: rubygem(webmock)
 BuildArch: noarch
 
 %description
@@ -45,8 +42,6 @@ Documentation for %{name}.
 %prep
 %setup -q -n  %{gem_name}-%{version} -b 1
 
-%patch0 -p1
-
 %build
 # Create the gem as gem install only works on a gem file
 gem build ../%{gem_name}-%{version}.gemspec
@@ -72,6 +67,15 @@ ln -s %{SOURCE2} ./config
 # Get rid of Bundler.
 sed -i '/[bB]undler/ s/^/#/' spec/spec_helper.rb
 
+# We don't need byebug to run the test suite.
+sed -i "/require 'byebug'/ s/^/#/" spec/spec_helper.rb
+
+# The 'fog-aws' is awailable in fog-aws 1.4.0+, but we have just 1.2.1 ATM :/
+sed -i "/require 'fog-aws'/ s|fog-aws|fog/aws|" spec/sitemap_generator/adapters/s3_adapter_spec.rb
+
+# We don't have aws-sdk-s3 in Fedora yet.
+mv spec/sitemap_generator/adapters/aws_sdk_adapter_spec.rb{,.disable}
+
 rspec -rsitemap_generator spec
 popd
 
@@ -91,5 +95,8 @@ popd
 %doc %{gem_instdir}/README.md
 
 %changelog
+* Tue Nov 28 2017 Vít Ondruch <vondruch@redhat.com> - 6.0.0-1
+- Update to sitemap_generator 6.0.0.
+
 * Mon Sep 11 2017 Vít Ondruch <vondruch@redhat.com> - 5.3.1-1
 - Initial package