[rubygem-mechanize] 2.7.3
Mamoru TASAKA
mtasaka at fedoraproject.org
Mon Nov 18 08:40:27 UTC 2013
commit 1e06a706e82d6cc66889bb49cf08d3ef0a81f41b
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Mon Nov 18 17:40:49 2013 +0900
2.7.3
.gitignore | 1 +
rubygem-mechanize-2.7.3-mime-type-2.x.patch | 39 +++++++++++++++++++++++++++
rubygem-mechanize.spec | 15 +++++++++-
sources | 2 +-
4 files changed, 55 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6874179..d286937 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ mechanize-1.0.0.gem
/mechanize-1.0.1.beta.20110107104205.gem
/mechanize-2.6.0.gem
/mechanize-2.7.2.gem
+/mechanize-2.7.3.gem
diff --git a/rubygem-mechanize-2.7.3-mime-type-2.x.patch b/rubygem-mechanize-2.7.3-mime-type-2.x.patch
new file mode 100644
index 0000000..3102052
--- /dev/null
+++ b/rubygem-mechanize-2.7.3-mime-type-2.x.patch
@@ -0,0 +1,39 @@
+From c8e32fe30dbda011ef78d0a68752f3a707c5e773 Mon Sep 17 00:00:00 2001
+From: Jeff Nyman <jeffnyman at gmail.com>
+Date: Mon, 11 Nov 2013 17:45:36 -0600
+Subject: [PATCH] Updated for mime-type 2.0.
+
+---
+ Rakefile | 2 +-
+ lib/mechanize/pluggable_parsers.rb | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Rakefile b/Rakefile
+index ffa2a91..72ea161 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -20,7 +20,7 @@ hoe = Hoe.spec 'mechanize' do
+
+ self.extra_deps << ['net-http-digest_auth', '~> 1.1', '>= 1.1.1']
+ self.extra_deps << ['net-http-persistent', '~> 2.5', '>= 2.5.2']
+- self.extra_deps << ['mime-types', '~> 1.17', '>= 1.17.2']
++ self.extra_deps << ['mime-types', '~> 2.0']
+ self.extra_deps << ['http-cookie', '~> 1.0']
+ self.extra_deps << ['nokogiri', '~> 1.4']
+ self.extra_deps << ['ntlm-http', '~> 0.1', '>= 0.1.1']
+diff --git a/lib/mechanize/pluggable_parsers.rb b/lib/mechanize/pluggable_parsers.rb
+index 7994e5b..4c4fc3b 100644
+--- a/lib/mechanize/pluggable_parsers.rb
++++ b/lib/mechanize/pluggable_parsers.rb
+@@ -99,7 +99,7 @@ def parser content_type
+ @parsers[mime_type.simplified] ||
+ @parsers[mime_type.media_type] ||
+ default
+- rescue MIME::InvalidContentType
++ rescue MIME::Type::InvalidContentType
+ default
+ end
+
+--
+1.8.4
+
diff --git a/rubygem-mechanize.spec b/rubygem-mechanize.spec
index 6005401..d3da764 100644
--- a/rubygem-mechanize.spec
+++ b/rubygem-mechanize.spec
@@ -1,6 +1,6 @@
# Initially Generated from mechanize-0.8.5.gem by gem2rpm -*- rpm-spec -*-
-%global majorver 2.7.2
+%global majorver 2.7.3
%undefine preminorver
%global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||')
%global fullver %{majorver}%{?preminorver}
@@ -25,6 +25,9 @@ Patch0: rubygem-mechanize-2.6.0-disable-ntlm-http.patch
Patch1: rubygem-mechanize-2.6.0-disable-ntlm-http-test.patch
# https://github.com/sparklemotion/mechanize/commit/f4a097743ca975476b3766c65c5d58e21e8ec47.patch
Patch2: rubygem-mechanize-2.7.x-test-unit-5.x.patch
+# https://github.com/sparklemotion/mechanize/commit/95f995d0e52386492fe5bedcfeaaca60726f5b54.patch
+# And 2 commits
+Patch3: rubygem-mechanize-2.7.3-mime-type-2.x.patch
BuildRequires: ruby(release)
BuildRequires: ruby-devel
@@ -93,6 +96,7 @@ find . -name \*.rb -print0 | xargs --null chmod 0644
%patch0 -p1 -b .ntlm
%patch1 -p1 -b .ntlmtest
%patch2 -p1 -b .unit5 -R
+%patch3 -p1 -b .mime2 -R
gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec
# Kill ntlm-http dependency
@@ -120,6 +124,12 @@ rm -f %{buildroot}%{gem_instdir}/{.autotest,.gemtest,.travis.yml}
%check
pushd ./%{gem_instdir}
+# http://pkgs.fedoraproject.org/cgit/openssl.git/tree/openssl-1.0.1e-no-md5-verify.patch
+# TODO: need "correct" solution
+%if 0%{?fedora} >= 21
+export OPENSSL_ENABLE_MD5_VERIFY=yes
+%endif
+
testrb -Ilib test
popd
@@ -142,6 +152,9 @@ popd
%exclude %{gem_instdir}/test/
%changelog
+* Mon Nov 18 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.7.3-1
+- 2.7.3
+
* Mon Nov 11 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.7.2-1
- 2.7.2
diff --git a/sources b/sources
index 057032e..67f7bc4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b21a0b08f6a067ad981e3b9e31146537 mechanize-2.7.2.gem
+55efbdf26bf87bd6aebb360eb30649c2 mechanize-2.7.3.gem
More information about the scm-commits
mailing list