From 7794a22dfb1d3f355db9f214a8208560d1d8a142 Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Feb 05 2020 17:48:40 +0000
Subject: Update to addressable 2.7.0


also enhance .spec and .gitignore files.

---

diff --git a/.gitignore b/.gitignore
index 861ba5c..004912f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-/addressable-2.3.2.gem
-/addressable-2.3.5.gem
-/addressable-2.3.6.gem
-/addressable-2.3.8.gem
-/addressable-2.5.2.gem
+/addressable-*.gem
diff --git a/addressable-2.5.2.gem b/addressable-2.5.2.gem
deleted file mode 100644
index 3e53ea0..0000000
Binary files a/addressable-2.5.2.gem and /dev/null differ
diff --git a/rubygem-addressable.spec b/rubygem-addressable.spec
index 995f4cd..487824c 100644
--- a/rubygem-addressable.spec
+++ b/rubygem-addressable.spec
@@ -2,8 +2,8 @@
 %global gem_name addressable
 
 Name: rubygem-%{gem_name}
-Version: 2.5.2
-Release: 6%{?dist}
+Version: 2.7.0
+Release: 1%{?dist}
 Summary: URI Implementation
 License: ASL 2.0
 URL: https://github.com/sporkmonger/addressable
@@ -14,16 +14,8 @@ BuildRequires: rubygem(bigdecimal)
 BuildRequires: rubygem(public_suffix)
 BuildRequires: rubygem(rspec-its)
 BuildRequires: rubygem(idn)
-#BuildRequires: rubygem(rspec)
-#BuildRequires: rubygem(launchy)
-#BuildRequires: rubygem(json_pure)
-#BuildRequires: rubygem(yard)
-#BuildRequires: rubygem(simplecov)
-#BuildRequires: rubygem(bundler)
-#BuildRequires: rubygem(rspec-core)
+BuildRequires: rubygem(rspec-core)
 BuildArch: noarch
-Patch0: no-rack-mount.patch
-Patch1: fix_addressable_tests.patch
 
 %description
 Addressable is a replacement for the URI implementation that is part of
@@ -39,23 +31,10 @@ BuildArch: noarch
 Documentation for %{name}.
 
 %prep
-gem unpack %{SOURCE0}
-
-%setup -q -D -T -n  %{gem_name}-%{version}
-
-gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
-
-# Revert f1d5855162c48d06eb1907871909d5859b9a7d3c (rack-mount)
-%patch0
-# Comment out failing tests
-%patch1
+%setup -q -n  %{gem_name}-%{version}
 
 %build
-# Create the gem as gem install only works on a gem file
-gem build %{gem_name}.gemspec
-
-# %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir
-# by default, so that we can move it into the buildroot in %%install
+gem build ../%{gem_name}-%{version}.gemspec
 %gem_install
 
 %install
@@ -72,12 +51,16 @@ rm spec/addressable/rack_mount_compat_spec.rb
 sed -i "/require 'bundler\/setup'/ s/^/#/" spec/spec_helper.rb
 
 # We don't care about code coverage.
-sed -i '/^begin$/,/^end$/ s/^/#/' spec/spec_helper.rb
+sed -i \
+  -e '/^\s*require..simplecov./,/^  end$/ s/^/#/g' \
+  -e '/^\s*require..coveralls./,/^  end$/ s/^/#/g' \
+  spec/spec_helper.rb
+
 
 # Remove tests failing because of missing internet connection
 rm spec/addressable/net_http_compat_spec.rb
 
-rspec spec/
+LC_ALL=C.UTF-8 rspec spec
 popd
 
 %files
@@ -98,6 +81,9 @@ popd
 %{gem_instdir}/spec
 
 %changelog
+* Fri Jan 31 2020 Pavel Valena <pvalena@redhat.com> - 2.7.0-1
+- Update to addressable 2.7.0.
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 5801951..2056f47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (addressable-2.5.2.gem) = ddd5aeb4b241efa897a636fd85bd227bd5c6a8ae56129b6bbbdfaad85cdbb74e3d0db4bb6693f7df148b66f68ca1f557ac17a1fb0ea7698d25d883ab0b690bc4
+SHA512 (addressable-2.7.0.gem) = 4c438bbfa8874fdcf11eef1d1f7cceb1855ea85948daff13615a0af129d35f92cc918f4bd5bbe4cd6ebccc67a86fc582265f915dc39831ec64209de0bdeeb732